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

Commit 8bc39bca authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.12-rc4 into tty-next 



We want the tty locking fix in here, so that maybe we can finally get it
fixed for real...

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 094094a9 3c2993b8

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

+2 −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

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/arm64/include/asm/acpi.h

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
	(acpi_gbl_FADT.header.revision < 6 ? 76 : 80)



#define BAD_MADT_GICC_ENTRY(entry, end)					\

	(!(entry) || (unsigned long)(entry) + sizeof(*(entry)) > (end) ||	\

	 (entry)->header.length != ACPI_MADT_GICC_LENGTH)

	(!(entry) || (entry)->header.length != ACPI_MADT_GICC_LENGTH ||	\

	(unsigned long)(entry) + ACPI_MADT_GICC_LENGTH > (end))



/* Basic configuration for ACPI */

#ifdef	CONFIG_ACPI

arch/arm64/kernel/pci.c

+3 −1
Original line number Diff line number Diff line
@@ -191,8 +191,10 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
		return NULL;



	root_ops = kzalloc_node(sizeof(*root_ops), GFP_KERNEL, node);

	if (!root_ops)

	if (!root_ops) {

		kfree(ri);

		return NULL;

	}



	ri->cfg = pci_acpi_setup_ecam_mapping(root);

	if (!ri->cfg) {