Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3edb1dd1 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core 

Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
parents 9ad95c46 77b246b3

Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

+0 −2
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ bias-bus-hold - latch weakly 
bias-pull-up		- pull up the pin

bias-pull-down		- pull down the pin

bias-pull-pin-default	- use pin-default pull state

bi-directional		- pin supports simultaneous input/output operations

drive-push-pull		- drive actively high and low

drive-open-drain	- drive with open drain

drive-open-source	- drive with open source
@@ -260,7 +259,6 @@ input-debounce - debounce mode with debound time X 
power-source		- select between different power supplies

low-power-enable	- enable low power mode

low-power-disable	- disable low power mode

output-enable		- enable output on pin regardless of output value

output-low		- set the pin to output mode with low level

output-high		- set the pin to output mode with high level

slew-rate		- set the slew rate

MAINTAINERS

+13 −2
Original line number Diff line number Diff line
@@ -10450,7 +10450,7 @@ S: Orphan 


PXA RTC DRIVER

M:	Robert Jarzmik <robert.jarzmik@free.fr>

L:	rtc-linux@googlegroups.com

L:	linux-rtc@vger.kernel.org

S:	Maintained



QAT DRIVER
@@ -10757,7 +10757,7 @@ X: kernel/torture.c 
REAL TIME CLOCK (RTC) SUBSYSTEM

M:	Alessandro Zummo <a.zummo@towertech.it>

M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>

L:	rtc-linux@googlegroups.com

L:	linux-rtc@vger.kernel.org

Q:	http://patchwork.ozlabs.org/project/rtc-linux/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git

S:	Maintained
@@ -13463,6 +13463,17 @@ W: http://en.wikipedia.org/wiki/Util-linux 
T:	git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git

S:	Maintained



UUID HELPERS

M:	Christoph Hellwig <hch@lst.de>

R:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>

L:	linux-kernel@vger.kernel.org

T:	git git://git.infradead.org/users/hch/uuid.git

F:	lib/uuid.c

F:	lib/test_uuid.c

F:	include/linux/uuid.h

F:	include/uapi/linux/uuid.h

S:	Maintained



UVESAFB DRIVER

M:	Michal Januszewski <spock@gentoo.org>

L:	linux-fbdev@vger.kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arm/include/asm/kvm_arm.h

+10 −0
Original line number Diff line number Diff line
@@ -187,6 +187,16 @@ 
#define FSC_FAULT	(0x04)

#define FSC_ACCESS	(0x08)

#define FSC_PERM	(0x0c)

#define FSC_SEA		(0x10)

#define FSC_SEA_TTW0	(0x14)

#define FSC_SEA_TTW1	(0x15)

#define FSC_SEA_TTW2	(0x16)

#define FSC_SEA_TTW3	(0x17)

#define FSC_SECC	(0x18)

#define FSC_SECC_TTW0	(0x1c)

#define FSC_SECC_TTW1	(0x1d)

#define FSC_SECC_TTW2	(0x1e)

#define FSC_SECC_TTW3	(0x1f)



/* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */

#define HPFAR_MASK	(~0xf)

arch/arm/include/asm/system_misc.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ extern void (*arm_pm_idle)(void); 


extern unsigned int user_debug;



static inline int handle_guest_sea(phys_addr_t addr, unsigned int esr)

{

	return -1;

}



#endif /* !__ASSEMBLY__ */



#endif /* __ASM_ARM_SYSTEM_MISC_H */