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

Commit 6af597de authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/urgent' into sched/core, to pick up fixes and resolve conflicts 



Conflicts:
	kernel/sched/fair.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 558a65bc 5aa50507

Documentation/device-mapper/snapshot.txt

+7 −3
Original line number Diff line number Diff line
@@ -41,9 +41,13 @@ useless and be disabled, returning errors. So it is important to monitor 
the amount of free space and expand the <COW device> before it fills up.



<persistent?> is P (Persistent) or N (Not persistent - will not survive

after reboot).

The difference is that for transient snapshots less metadata must be

saved on disk - they can be kept in memory by the kernel.

after reboot).  O (Overflow) can be added as a persistent store option

to allow userspace to advertise its support for seeing "Overflow" in the

snapshot status.  So supported store types are "P", "PO" and "N".



The difference between persistent and transient is with transient

snapshots less metadata must be saved on disk - they can be kept in

memory by the kernel.





* snapshot-merge <origin> <COW device> <persistent> <chunksize>

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings: 
- renesas,tx-fifo-size : Overrides the default tx fifo size given in words

			 (default is 64)

- renesas,rx-fifo-size : Overrides the default rx fifo size given in words

			 (default is 64, or 256 on R-Car Gen2)

			 (default is 64)



Pinctrl properties might be needed, too.  See

Documentation/devicetree/bindings/pinctrl/renesas,*.

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7795"

  - reg: Base address and length of the register for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - clocks: A list of phandle + clock specifier pairs

MAINTAINERS

+2 −12
Original line number Diff line number Diff line
@@ -4003,7 +4003,7 @@ S: Maintained 
F:	sound/usb/misc/ua101.c



EXTENSIBLE FIRMWARE INTERFACE (EFI)

M:	Matt Fleming <matt.fleming@intel.com>

M:	Matt Fleming <matt@codeblueprint.co.uk>

L:	linux-efi@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git

S:	Maintained
@@ -4018,7 +4018,7 @@ F: include/linux/efi*.h 
EFI VARIABLE FILESYSTEM

M:	Matthew Garrett <matthew.garrett@nebula.com>

M:	Jeremy Kerr <jk@ozlabs.org>

M:	Matt Fleming <matt.fleming@intel.com>

M:	Matt Fleming <matt@codeblueprint.co.uk>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git

L:	linux-efi@vger.kernel.org

S:	Maintained
@@ -9914,7 +9914,6 @@ S: Maintained 
F:	drivers/staging/lustre



STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)

M:	Julian Andres Klode <jak@jak-linux.org>

M:	Marc Dietrich <marvin24@gmx.de>

L:	ac100@lists.launchpad.net (moderated for non-subscribers)

L:	linux-tegra@vger.kernel.org
@@ -11378,15 +11377,6 @@ W: http://oops.ghostprotocols.net:81/blog 
S:	Maintained

F:	drivers/net/wireless/wl3501*



WM97XX TOUCHSCREEN DRIVERS

M:	Mark Brown <broonie@kernel.org>

M:	Liam Girdwood <lrg@slimlogic.co.uk>

L:	linux-input@vger.kernel.org

W:	https://github.com/CirrusLogic/linux-drivers/wiki

S:	Supported

F:	drivers/input/touchscreen/*wm97*

F:	include/linux/wm97xx.h



WOLFSON MICROELECTRONICS DRIVERS

L:	patches@opensource.wolfsonmicro.com

T:	git https://github.com/CirrusLogic/linux-drivers.git

Makefile

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

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc4

NAME = Hurr durr I'ma sheep

EXTRAVERSION = -rc5

NAME = Blurry Fish Butt



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"