Merge branch 'for-next' into for-linus (f81483aa) · Commits · jan.koester / Linux

.mailmap

+6 −0

Documentation/ABI/obsolete/o2cb

0 → 100644

+11 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/o2cb
			Date: Dec 2005
			KernelVersion: 2.6.16
			Contact: ocfs2-devel@oss.oracle.com
			Description: Ocfs2-tools looks at 'interface-revision' for versioning
			information. Each logmask/ file controls a set of debug prints
			and can be written into with the strings "allow", "deny", or
			"off". Reading the file returns the current state.
			Was renamed to /sys/fs/u2cb/
			Users: ocfs2-tools. It's sufficient to mail proposed changes to
			ocfs2-devel@oss.oracle.com.

Documentation/ABI/obsolete/sysfs-bus-iio

+4 −0

Documentation/ABI/stable/o2cb

+1 −1

Original line number	Original line	Diff line number	Diff line
	What: /sys/fs/o2cb/ (was /sys/o2cb)		What: /sys/fs/o2cb/
	Date: Dec 2005		Date: Dec 2005
	KernelVersion: 2.6.16		KernelVersion: 2.6.16
	Contact: ocfs2-devel@oss.oracle.com		Contact: ocfs2-devel@oss.oracle.com

Documentation/ABI/stable/sysfs-class-infiniband

+32 −32

Original line number	Original line	Diff line number	Diff line
	@@ -232,10 +232,10 @@ Description: The RoCE type of the associated GID resides at index <gid-index>.
	or "RoCE v2" for RoCE v2 based GIDs.		or "RoCE v2" for RoCE v2 based GIDs.


	What: /sys/class/infiniband_mad/umadN/ibdev		What: /sys/class/infiniband_mad/umad<N>/ibdev
	What: /sys/class/infiniband_mad/umadN/port		What: /sys/class/infiniband_mad/umad<N>/port
	What: /sys/class/infiniband_mad/issmN/ibdev		What: /sys/class/infiniband_mad/issm<N>/ibdev
	What: /sys/class/infiniband_mad/issmN/port		What: /sys/class/infiniband_mad/issm<N>/port
	Date: Apr, 2005		Date: Apr, 2005
	KernelVersion: v2.6.12		KernelVersion: v2.6.12
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org
	@@ -261,8 +261,8 @@ Description:
	userspace ABI compatibility of umad & issm devices.		userspace ABI compatibility of umad & issm devices.


	What: /sys/class/infiniband_verbs/uverbsN/ibdev		What: /sys/class/infiniband_verbs/uverbs<N>/ibdev
	What: /sys/class/infiniband_verbs/uverbsN/abi_version		What: /sys/class/infiniband_verbs/uverbs<N>/abi_version
	Date: Sept, 2005		Date: Sept, 2005
	KernelVersion: v2.6.14		KernelVersion: v2.6.14
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org
	@@ -471,7 +471,7 @@ Description:
	=============== ======================================================		=============== ======================================================


	What: /sys/class/infiniband/qibX/ports/N/sl2vl/[0-15]		What: /sys/class/infiniband/qibX/ports/<N>/sl2vl/[0-15]
	Date: May, 2010		Date: May, 2010
	KernelVersion: v2.6.35		KernelVersion: v2.6.35
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org
	@@ -480,8 +480,8 @@ Description:
	the Service Level (SL). Listing the SL files returns the Virtual		the Service Level (SL). Listing the SL files returns the Virtual
	Lane (VL) as programmed by the SL.		Lane (VL) as programmed by the SL.

	What: /sys/class/infiniband/qibX/ports/N/CCMgtA/cc_settings_bin		What: /sys/class/infiniband/qibX/ports/<N>/CCMgtA/cc_settings_bin
	What: /sys/class/infiniband/qibX/ports/N/CCMgtA/cc_table_bin		What: /sys/class/infiniband/qibX/ports/<N>/CCMgtA/cc_table_bin
	Date: May, 2010		Date: May, 2010
	KernelVersion: v2.6.35		KernelVersion: v2.6.35
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org
	@@ -499,11 +499,11 @@ Description:
	delay.		delay.
	=============== ================================================		=============== ================================================

	What: /sys/class/infiniband/qibX/ports/N/linkstate/loopback		What: /sys/class/infiniband/qibX/ports/<N>/linkstate/loopback
	What: /sys/class/infiniband/qibX/ports/N/linkstate/led_override		What: /sys/class/infiniband/qibX/ports/<N>/linkstate/led_override
	What: /sys/class/infiniband/qibX/ports/N/linkstate/hrtbt_enable		What: /sys/class/infiniband/qibX/ports/<N>/linkstate/hrtbt_enable
	What: /sys/class/infiniband/qibX/ports/N/linkstate/status		What: /sys/class/infiniband/qibX/ports/<N>/linkstate/status
	What: /sys/class/infiniband/qibX/ports/N/linkstate/status_str		What: /sys/class/infiniband/qibX/ports/<N>/linkstate/status_str
	Date: May, 2010		Date: May, 2010
	KernelVersion: v2.6.35		KernelVersion: v2.6.35
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org
	@@ -523,16 +523,16 @@ Description:
	"Fatal_Hardware_Error".		"Fatal_Hardware_Error".
	=============== ===============================================		=============== ===============================================

	What: /sys/class/infiniband/qibX/ports/N/diag_counters/rc_resends		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/rc_resends
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/seq_naks		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/seq_naks
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/rdma_seq		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/rdma_seq
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/rnr_naks		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/rnr_naks
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/other_naks		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/other_naks
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/rc_timeouts		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/rc_timeouts
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/look_pkts		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/look_pkts
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/pkt_drops		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/pkt_drops
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/dma_wait		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/dma_wait
	What: /sys/class/infiniband/qibX/ports/N/diag_counters/unaligned		What: /sys/class/infiniband/qibX/ports/<N>/diag_counters/unaligned
	Date: May, 2010		Date: May, 2010
	KernelVersion: v2.6.35		KernelVersion: v2.6.35
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org
	@@ -650,9 +650,9 @@ Description:
	=============== =============================================		=============== =============================================


	What: /sys/class/infiniband/hfi1_X/ports/N/CCMgtA/cc_settings_bin		What: /sys/class/infiniband/hfi1_X/ports/<N>/CCMgtA/cc_settings_bin
	What: /sys/class/infiniband/hfi1_X/ports/N/CCMgtA/cc_table_bin		What: /sys/class/infiniband/hfi1_X/ports/<N>/CCMgtA/cc_table_bin
	What: /sys/class/infiniband/hfi1_X/ports/N/CCMgtA/cc_prescan		What: /sys/class/infiniband/hfi1_X/ports/<N>/CCMgtA/cc_prescan
	Date: May, 2016		Date: May, 2016
	KernelVersion: v4.6		KernelVersion: v4.6
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org
	@@ -675,9 +675,9 @@ Description:
	disable.		disable.
	=============== ================================================		=============== ================================================

	What: /sys/class/infiniband/hfi1_X/ports/N/sc2vl/[0-31]		What: /sys/class/infiniband/hfi1_X/ports/<N>/sc2vl/[0-31]
	What: /sys/class/infiniband/hfi1_X/ports/N/sl2sc/[0-31]		What: /sys/class/infiniband/hfi1_X/ports/<N>/sl2sc/[0-31]
	What: /sys/class/infiniband/hfi1_X/ports/N/vl2mtu/[0-15]		What: /sys/class/infiniband/hfi1_X/ports/<N>/vl2mtu/[0-15]
	Date: May, 2016		Date: May, 2016
	KernelVersion: v4.6		KernelVersion: v4.6
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org
	@@ -691,8 +691,8 @@ Description:
	=============== ===================================================		=============== ===================================================


	What: /sys/class/infiniband/hfi1_X/sdma_N/cpu_list		What: /sys/class/infiniband/hfi1_X/sdma_<N>/cpu_list
	What: /sys/class/infiniband/hfi1_X/sdma_N/vl		What: /sys/class/infiniband/hfi1_X/sdma_<N>/vl
	Date: Sept, 2016		Date: Sept, 2016
	KernelVersion: v4.8		KernelVersion: v4.8
	Contact: linux-rdma@vger.kernel.org		Contact: linux-rdma@vger.kernel.org

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,8 @@ Al Viro <viro@zenIV.linux.org.uk>
	Andi Kleen <ak@linux.intel.com> <ak@suse.de>		Andi Kleen <ak@linux.intel.com> <ak@suse.de>
	Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>		Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
	Andreas Herrmann <aherrman@de.ibm.com>		Andreas Herrmann <aherrman@de.ibm.com>
			Andrej Shadura <andrew.shadura@collabora.co.uk>
			Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>
	Andrew Morton <akpm@linux-foundation.org>		Andrew Morton <akpm@linux-foundation.org>
	Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>		Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>
	Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>		Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
	@@ -71,6 +73,8 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
	Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>		Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
	Christophe Ricard <christophe.ricard@gmail.com>		Christophe Ricard <christophe.ricard@gmail.com>
	Christoph Hellwig <hch@lst.de>		Christoph Hellwig <hch@lst.de>
			Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
			Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>
	Corey Minyard <minyard@acm.org>		Corey Minyard <minyard@acm.org>
	Damian Hobson-Garcia <dhobsong@igel.co.jp>		Damian Hobson-Garcia <dhobsong@igel.co.jp>
	Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>		Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
	@@ -98,6 +102,7 @@ Douglas Gilbert <dougg@torque.net>
	Ed L. Cashin <ecashin@coraid.com>		Ed L. Cashin <ecashin@coraid.com>
	Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>		Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
	Evgeniy Polyakov <johnpol@2ka.mipt.ru>		Evgeniy Polyakov <johnpol@2ka.mipt.ru>
			Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
	Felipe W Damasio <felipewd@terra.com.br>		Felipe W Damasio <felipewd@terra.com.br>
	Felix Kuhling <fxkuehl@gmx.de>		Felix Kuhling <fxkuehl@gmx.de>
	Felix Moeller <felix@derklecks.de>		Felix Moeller <felix@derklecks.de>
	@@ -276,6 +281,7 @@ Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
	Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>		Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
	Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>		Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
	Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>		Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
			Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
	Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>		Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
	Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>		Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
	Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>		Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,7 @@ Description:

	Since Kernel 5.11, multiple buffers are supported.		Since Kernel 5.11, multiple buffers are supported.
	so, it is better to use, instead:		so, it is better to use, instead:

	/sys/bus/iio/devices/iio:deviceX/bufferY/length		/sys/bus/iio/devices/iio:deviceX/bufferY/length

	What: /sys/bus/iio/devices/iio:deviceX/buffer/enable		What: /sys/bus/iio/devices/iio:deviceX/buffer/enable
	@@ -17,6 +18,7 @@ Description:

	Since Kernel 5.11, multiple buffers are supported.		Since Kernel 5.11, multiple buffers are supported.
	so, it is better to use, instead:		so, it is better to use, instead:

	/sys/bus/iio/devices/iio:deviceX/bufferY/enable		/sys/bus/iio/devices/iio:deviceX/bufferY/enable

	What: /sys/bus/iio/devices/iio:deviceX/scan_elements		What: /sys/bus/iio/devices/iio:deviceX/scan_elements
	@@ -165,6 +167,7 @@ Description:

	Since Kernel 5.11, multiple buffers are supported.		Since Kernel 5.11, multiple buffers are supported.
	so, it is better to use, instead:		so, it is better to use, instead:

	/sys/bus/iio/devices/iio:deviceX/bufferY/watermark		/sys/bus/iio/devices/iio:deviceX/bufferY/watermark

	What: /sys/bus/iio/devices/iio:deviceX/buffer/data_available		What: /sys/bus/iio/devices/iio:deviceX/buffer/data_available
	@@ -179,4 +182,5 @@ Description:

	Since Kernel 5.11, multiple buffers are supported.		Since Kernel 5.11, multiple buffers are supported.
	so, it is better to use, instead:		so, it is better to use, instead:

	/sys/bus/iio/devices/iio:deviceX/bufferY/data_available		/sys/bus/iio/devices/iio:deviceX/bufferY/data_available