Commit ac3c860c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge tag 'nfs-rdma-4.4-2' of git://git.linux-nfs.org/projects/anna/nfs-rdma 



NFS: NFSoRDMA Client Side Changes

In addition to a variety of bugfixes, these patches are mostly geared at
enabling both swap and backchannel support to the NFS over RDMA client.

Signed-off-by: default avatarAnna Schumake <Anna.Schumaker@Netapp.com>
parents 260074cd 76566773

Documentation/device-mapper/snapshot.txt

+7 −3
Original line number Original line 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.

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

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

after reboot).

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

The difference is that for transient snapshots less metadata must be

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

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

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>

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

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

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

	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7795"

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

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

  - interrupts: Interrupt specifier for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - clocks: A list of phandle + clock specifier pairs

  - clocks: A list of phandle + clock specifier pairs

MAINTAINERS

+26 −12
Original line number Original line Diff line number Diff line
@@ -3591,6 +3591,13 @@ F: drivers/gpu/drm/i915/ 
F:	include/drm/i915*

F:	include/drm/i915*

F:	include/uapi/drm/i915*

F:	include/uapi/drm/i915*





DRM DRIVERS FOR ATMEL HLCDC

M:	Boris Brezillon <boris.brezillon@free-electrons.com>

L:	dri-devel@lists.freedesktop.org

S:	Supported

F:	drivers/gpu/drm/atmel-hlcdc/

F:	Documentation/devicetree/bindings/drm/atmel/



DRM DRIVERS FOR EXYNOS

DRM DRIVERS FOR EXYNOS

M:	Inki Dae <inki.dae@samsung.com>

M:	Inki Dae <inki.dae@samsung.com>

M:	Joonyoung Shim <jy0922.shim@samsung.com>

M:	Joonyoung Shim <jy0922.shim@samsung.com>
@@ -3619,6 +3626,14 @@ S: Maintained 
F:	drivers/gpu/drm/imx/

F:	drivers/gpu/drm/imx/

F:	Documentation/devicetree/bindings/drm/imx/

F:	Documentation/devicetree/bindings/drm/imx/





DRM DRIVERS FOR GMA500 (Poulsbo, Moorestown and derivative chipsets)

M:	Patrik Jakobsson <patrik.r.jakobsson@gmail.com>

L:	dri-devel@lists.freedesktop.org

T:	git git://github.com/patjak/drm-gma500

S:	Maintained

F:	drivers/gpu/drm/gma500

F:	include/drm/gma500*



DRM DRIVERS FOR NVIDIA TEGRA

DRM DRIVERS FOR NVIDIA TEGRA

M:	Thierry Reding <thierry.reding@gmail.com>

M:	Thierry Reding <thierry.reding@gmail.com>

M:	Terje Bergström <tbergstrom@nvidia.com>

M:	Terje Bergström <tbergstrom@nvidia.com>
@@ -4003,7 +4018,7 @@ S: Maintained 
F:	sound/usb/misc/ua101.c

F:	sound/usb/misc/ua101.c





EXTENSIBLE FIRMWARE INTERFACE (EFI)

EXTENSIBLE FIRMWARE INTERFACE (EFI)

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

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

L:	linux-efi@vger.kernel.org

L:	linux-efi@vger.kernel.org

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

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

S:	Maintained

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

EFI VARIABLE FILESYSTEM

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

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

M:	Jeremy Kerr <jk@ozlabs.org>

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

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

L:	linux-efi@vger.kernel.org

L:	linux-efi@vger.kernel.org

S:	Maintained

S:	Maintained
@@ -9101,6 +9116,15 @@ S: Supported 
F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt

F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt

F: drivers/net/ethernet/synopsys/dwc_eth_qos.c

F: drivers/net/ethernet/synopsys/dwc_eth_qos.c





SYNOPSYS DESIGNWARE I2C DRIVER

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

M:	Jarkko Nikula <jarkko.nikula@linux.intel.com>

M:	Mika Westerberg <mika.westerberg@linux.intel.com>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/busses/i2c-designware-*

F:	include/linux/platform_data/i2c-designware.h



SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER

SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER

M:	Seungwon Jeon <tgih.jun@samsung.com>

M:	Seungwon Jeon <tgih.jun@samsung.com>

M:	Jaehoon Chung <jh80.chung@samsung.com>

M:	Jaehoon Chung <jh80.chung@samsung.com>
@@ -9914,7 +9938,6 @@ S: Maintained 
F:	drivers/staging/lustre

F:	drivers/staging/lustre





STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)

STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)

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

M:	Marc Dietrich <marvin24@gmx.de>

M:	Marc Dietrich <marvin24@gmx.de>

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

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

L:	linux-tegra@vger.kernel.org

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

S:	Maintained

F:	drivers/net/wireless/wl3501*

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

WOLFSON MICROELECTRONICS DRIVERS

L:	patches@opensource.wolfsonmicro.com

L:	patches@opensource.wolfsonmicro.com

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

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

Makefile

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

VERSION = 4

PATCHLEVEL = 3

PATCHLEVEL = 3

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc6

NAME = Hurr durr I'ma sheep

NAME = Blurry Fish Butt





# *DOCUMENTATION*

# *DOCUMENTATION*

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

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

arch/arm/boot/dts/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -578,7 +578,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-hackberry.dtb \

	sun4i-a10-hackberry.dtb \

	sun4i-a10-hyundai-a7hd.dtb \

	sun4i-a10-hyundai-a7hd.dtb \

	sun4i-a10-inet97fv2.dtb \

	sun4i-a10-inet97fv2.dtb \

	sun4i-a10-itead-iteaduino-plus.dts \

	sun4i-a10-itead-iteaduino-plus.dtb \

	sun4i-a10-jesurun-q5.dtb \

	sun4i-a10-jesurun-q5.dtb \

	sun4i-a10-marsboard.dtb \

	sun4i-a10-marsboard.dtb \

	sun4i-a10-mini-xplus.dtb \

	sun4i-a10-mini-xplus.dtb \