Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (1c5ba67d) · Commits · e / devices / android_kernel_fairphone_FP5

.mailmap

+2 −0

CREDITS

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3364,6 +3364,14 @@ S: Braunschweiger Strasse 79
	S: 31134 Hildesheim		S: 31134 Hildesheim
	S: Germany		S: Germany

			N: Martin Schwidefsky
			D: Martin was the most significant contributor to the initial s390
			D: port of the Linux Kernel and later the maintainer of the s390
			D: architecture backend for almost two decades.
			D: He passed away in 2019, and will be greatly missed.
			S: Germany
			W: https://lwn.net/Articles/789028/

	N: Marcel Selhorst		N: Marcel Selhorst
	E: tpmdd@selhorst.net		E: tpmdd@selhorst.net
	D: TPM driver		D: TPM driver

Documentation/ABI/testing/sysfs-bus-siox

+11 −11

Original line number	Original line	Diff line number	Diff line
	What: /sys/bus/siox/devices/siox-X/active		What: /sys/bus/siox/devices/siox-X/active
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	On reading represents the current state of the bus. If it		On reading represents the current state of the bus. If it
	contains a "0" the bus is stopped and connected devices are		contains a "0" the bus is stopped and connected devices are
	@@ -12,7 +12,7 @@ Description:

	What: /sys/bus/siox/devices/siox-X/device_add		What: /sys/bus/siox/devices/siox-X/device_add
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Write-only file. Write		Write-only file. Write

	@@ -27,13 +27,13 @@ Description:

	What: /sys/bus/siox/devices/siox-X/device_remove		What: /sys/bus/siox/devices/siox-X/device_remove
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Write-only file. A single write removes the last device in the siox chain.		Write-only file. A single write removes the last device in the siox chain.

	What: /sys/bus/siox/devices/siox-X/poll_interval_ns		What: /sys/bus/siox/devices/siox-X/poll_interval_ns
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Defines the interval between two poll cycles in nano seconds.		Defines the interval between two poll cycles in nano seconds.
	Note this is rounded to jiffies on writing. On reading the current value		Note this is rounded to jiffies on writing. On reading the current value
	@@ -41,33 +41,33 @@ Description:

	What: /sys/bus/siox/devices/siox-X-Y/connected		What: /sys/bus/siox/devices/siox-X-Y/connected
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.		Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.
	communication with it is not ensured. "1" signals a working connection.		communication with it is not ensured. "1" signals a working connection.

	What: /sys/bus/siox/devices/siox-X-Y/inbytes		What: /sys/bus/siox/devices/siox-X-Y/inbytes
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Read-only value reporting the inbytes value provided to siox-X/device_add		Read-only value reporting the inbytes value provided to siox-X/device_add

	What: /sys/bus/siox/devices/siox-X-Y/status_errors		What: /sys/bus/siox/devices/siox-X-Y/status_errors
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Counts the number of time intervals when the read status byte doesn't yield the		Counts the number of time intervals when the read status byte doesn't yield the
	expected value.		expected value.

	What: /sys/bus/siox/devices/siox-X-Y/type		What: /sys/bus/siox/devices/siox-X-Y/type
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Read-only value reporting the type value provided to siox-X/device_add.		Read-only value reporting the type value provided to siox-X/device_add.

	What: /sys/bus/siox/devices/siox-X-Y/watchdog		What: /sys/bus/siox/devices/siox-X-Y/watchdog
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Read-only value reporting if the watchdog of the siox device is		Read-only value reporting if the watchdog of the siox device is
	active. "0" means the watchdog is not active and the device is expected to		active. "0" means the watchdog is not active and the device is expected to
	@@ -75,13 +75,13 @@ Description:

	What: /sys/bus/siox/devices/siox-X-Y/watchdog_errors		What: /sys/bus/siox/devices/siox-X-Y/watchdog_errors
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Read-only value reporting the number to time intervals when the		Read-only value reporting the number to time intervals when the
	watchdog was active.		watchdog was active.

	What: /sys/bus/siox/devices/siox-X-Y/outbytes		What: /sys/bus/siox/devices/siox-X-Y/outbytes
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Description:		Description:
	Read-only value reporting the outbytes value provided to siox-X/device_add.		Read-only value reporting the outbytes value provided to siox-X/device_add.

Documentation/ABI/testing/sysfs-class-net-qmi

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ Contact: Bjørn Mork <bjorn@mork.no>
	Description:		Description:
	Unsigned integer.		Unsigned integer.

	Write a number ranging from 1 to 127 to add a qmap mux		Write a number ranging from 1 to 254 to add a qmap mux
	based network device, supported by recent Qualcomm based		based network device, supported by recent Qualcomm based
	modems.		modems.

	@@ -46,5 +46,5 @@ Contact: Bjørn Mork <bjorn@mork.no>
	Description:		Description:
	Unsigned integer.		Unsigned integer.

	Write a number ranging from 1 to 127 to delete a previously		Write a number ranging from 1 to 254 to delete a previously
	created qmap mux based network device.		created qmap mux based network device.

Documentation/admin-guide/cgroup-v2.rst

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -177,6 +177,15 @@ cgroup v2 currently supports the following mount options.
	ignored on non-init namespace mounts. Please refer to the		ignored on non-init namespace mounts. Please refer to the
	Delegation section for details.		Delegation section for details.

			memory_localevents

			Only populate memory.events with data for the current cgroup,
			and not any subtrees. This is legacy behaviour, the default
			behaviour without this option is to include subtree counts.
			This option is system wide and can only be set on mount or
			modified through remount from the init namespace. The mount
			option is ignored on non-init namespace mounts.


	Organizing Processes and Threads		Organizing Processes and Threads
	--------------------------------		--------------------------------

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)>
	Greg Kroah-Hartman <gregkh@suse.de>		Greg Kroah-Hartman <gregkh@suse.de>
	Greg Kroah-Hartman <greg@kroah.com>		Greg Kroah-Hartman <greg@kroah.com>
	Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>		Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
			Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
	Henk Vergonet <Henk.Vergonet@gmail.com>		Henk Vergonet <Henk.Vergonet@gmail.com>
	Henrik Kretzschmar <henne@nachtwindheim.de>		Henrik Kretzschmar <henne@nachtwindheim.de>
	Henrik Rydberg <rydberg@bitmath.org>		Henrik Rydberg <rydberg@bitmath.org>
	@@ -238,6 +239,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
	Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>		Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
	Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>		Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
	Takashi YOSHII <takashi.yoshii.zj@renesas.com>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
			Will Deacon <will@kernel.org> <will.deacon@arm.com>
	Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>		Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
	Yusuke Goda <goda.yusuke@renesas.com>		Yusuke Goda <goda.yusuke@renesas.com>
	Gustavo Padovan <gustavo@las.ic.unicamp.br>		Gustavo Padovan <gustavo@las.ic.unicamp.br>