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

Commit e2d6f8a5 authored Feb 13, 2016 by Ingo Molnar

Merge branch 'linus' into locking/core, to resolve conflicts



Conflicts:
	kernel/locking/lockdep.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents fed0764f 0cbb0b92

Documentation/cgroup-v2.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and
		conventions of cgroup v2. It describes all userland-visible aspects
		of cgroup including core and specific controller behaviors. All
		future changes must be reflected in this document. Documentation for
		v1 is available under Documentation/cgroup-legacy/.
		v1 is available under Documentation/cgroup-v1/.

		CONTENTS

Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ OHCI and EHCI controllers.
		Required properties:
		- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;
		"renesas,pci-r8a7791" for the R8A7791 SoC;
		"renesas,pci-r8a7793" for the R8A7793 SoC;
		"renesas,pci-r8a7794" for the R8A7794 SoC;
		"renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device

Documentation/devicetree/bindings/pci/rcar-pci.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ Required properties:
		compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
		"renesas,pcie-r8a7790" for the R8A7790 SoC;
		"renesas,pcie-r8a7791" for the R8A7791 SoC;
		"renesas,pcie-r8a7793" for the R8A7793 SoC;
		"renesas,pcie-r8a7795" for the R8A7795 SoC;
		"renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device.

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ The compatible list for this generic sound card currently:
		"fsl,imx-audio-sgtl5000"
		(compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)

		"fsl,imx-audio-wm8960"

		Required properties:

		- compatible : Contains one of entries in the compatible list.

Documentation/kernel-parameters.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -4235,6 +4235,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		The default value of this parameter is determined by
		the config option CONFIG_WQ_POWER_EFFICIENT_DEFAULT.

		workqueue.debug_force_rr_cpu
		Workqueue used to implicitly guarantee that work
		items queued without explicit CPU specified are put
		on the local CPU. This guarantee is no longer true
		and while local CPU is still preferred work items
		may be put on foreign CPUs. This debug option
		forces round-robin CPU selection to flush out
		usages which depend on the now broken guarantee.
		When enabled, memory and cache locality will be
		impacted.

		x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of
		default x2apic cluster mode on platforms
		supporting x2apic.