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

Commit b349e9a9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 7c360572 59fd1214
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
Andrew Morton <akpm@linux-foundation.org>
Andrew Vasquez <andrew.vasquez@qlogic.com>
Andy Adamson <andros@citi.umich.edu>
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
Archit Taneja <archit@ti.com>
Arnaud Patard <arnaud.patard@rtp-net.org>
Arnd Bergmann <arnd@arndb.de>
+11 −0
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ N: NeilBrown
E: neil@brown.name
P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F  497A 39EC 9EDD 5662 81B9
D: NFSD Maintainer 2000-2007
D: MD Maintainer 2001-2016

N: Zach Brown
E: zab@zabbo.net
@@ -1855,6 +1856,16 @@ S: Korte Heul 95
S: 1403 ND  BUSSUM
S: The Netherlands

N: Martin Kepplinger
E: martink@posteo.de
E: martin.kepplinger@theobroma-systems.com
W: http://www.martinkepplinger.com
D: mma8452 accelerators iio driver
D: Kernel cleanups
S: Garnisonstraße 26
S: 4020 Linz
S: Austria

N: Karl Keyte
E: karl@koft.com
D: Disk usage statistics and modifications to line printer driver
+22 −0
Original line number Diff line number Diff line
What: 		/config/rdma_cm
Date: 		November 29, 2015
KernelVersion:  4.4.0
Description: 	Interface is used to configure RDMA-cable HCAs in respect to
		RDMA-CM attributes.

		Attributes are visible only when configfs is mounted. To mount
		configfs in /config directory use:
		# mount -t configfs none /config/

		In order to set parameters related to a specific HCA, a directory
		for this HCA has to be created:
		mkdir -p /config/rdma_cm/<hca>


What: 		/config/rdma_cm/<hca>/ports/<port-num>/default_roce_mode
Date: 		November 29, 2015
KernelVersion:  4.4.0
Description: 	RDMA-CM based connections from HCA <hca> at port <port-num>
		will be initiated with this RoCE type as default.
		The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".
		This parameter has RW access.
+6 −0
Original line number Diff line number Diff line
What:		/config/usb-gadget/gadget/functions/tcm.name
Date:		Dec 2015
KernelVersion:	4.5
Description:
		There are no attributes because all the configuration
		is performed in the "target" subsystem of configfs.
+16 −0
Original line number Diff line number Diff line
What:		/sys/class/infiniband/<hca>/ports/<port-number>/gid_attrs/ndevs/<gid-index>
Date:		November 29, 2015
KernelVersion:	4.4.0
Contact:	linux-rdma@vger.kernel.org
Description: 	The net-device's name associated with the GID resides
		at index <gid-index>.

What:		/sys/class/infiniband/<hca>/ports/<port-number>/gid_attrs/types/<gid-index>
Date:		November 29, 2015
KernelVersion:	4.4.0
Contact:	linux-rdma@vger.kernel.org
Description: 	The RoCE type of the associated GID resides at index <gid-index>.
		This could either be "IB/RoCE v1" for IB and RoCE v1 based GODs
		or "RoCE v2" for RoCE v2 based GIDs.

Loading