Merge 5.2-rc3 into tty-next (888dc273) · Commits · jan.koester / Linux

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-mdio

deleted100644 → 0

+0 −29

Original line number	Original line	Diff line number	Diff line
	What: /sys/bus/mdio_bus/devices/.../phy_id
	Date: November 2012
	KernelVersion: 3.8
	Contact: netdev@vger.kernel.org
	Description:
	This attribute contains the 32-bit PHY Identifier as reported
	by the device during bus enumeration, encoded in hexadecimal.
	This ID is used to match the device with the appropriate
	driver.

	What: /sys/bus/mdio_bus/devices/.../phy_interface
	Date: February 2014
	KernelVersion: 3.15
	Contact: netdev@vger.kernel.org
	Description:
	This attribute contains the PHY interface as configured by the
	Ethernet driver during bus enumeration, encoded in string.
	This interface mode is used to configure the Ethernet MAC with the
	appropriate mode for its data lines to the PHY hardware.

	What: /sys/bus/mdio_bus/devices/.../phy_has_fixups
	Date: February 2014
	KernelVersion: 3.15
	Contact: netdev@vger.kernel.org
	Description:
	This attribute contains the boolean value whether a given PHY
	device has had any "fixup" workaround running on it, encoded as
	a boolean. This information is provided to help troubleshooting
	PHY configurations.

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

+13 −6

Original line number	Original line	Diff line number	Diff line
	@@ -11,24 +11,31 @@ Date: February 2014
	KernelVersion: 3.15		KernelVersion: 3.15
	Contact: netdev@vger.kernel.org		Contact: netdev@vger.kernel.org
	Description:		Description:
	Boolean value indicating whether the PHY device has		This attribute contains the boolean value whether a given PHY
	any fixups registered against it (phy_register_fixup)		device has had any "fixup" workaround running on it, encoded as
			a boolean. This information is provided to help troubleshooting
			PHY configurations.

	What: /sys/class/mdio_bus/<bus>/<device>/phy_id		What: /sys/class/mdio_bus/<bus>/<device>/phy_id
	Date: November 2012		Date: November 2012
	KernelVersion: 3.8		KernelVersion: 3.8
	Contact: netdev@vger.kernel.org		Contact: netdev@vger.kernel.org
	Description:		Description:
	32-bit hexadecimal value corresponding to the PHY device's OUI,		This attribute contains the 32-bit PHY Identifier as reported
	model and revision number.		by the device during bus enumeration, encoded in hexadecimal.
			This ID is used to match the device with the appropriate
			driver.

	What: /sys/class/mdio_bus/<bus>/<device>/phy_interface		What: /sys/class/mdio_bus/<bus>/<device>/phy_interface
	Date: February 2014		Date: February 2014
	KernelVersion: 3.15		KernelVersion: 3.15
	Contact: netdev@vger.kernel.org		Contact: netdev@vger.kernel.org
	Description:		Description:
	String value indicating the PHY interface, possible		This attribute contains the PHY interface as configured by the
	values are:.		Ethernet driver during bus enumeration, encoded in string.
			This interface mode is used to configure the Ethernet MAC with the
			appropriate mode for its data lines to the PHY hardware.
			Possible values are:
	<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,		<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,
	rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii		rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii
	xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,		xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,

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
	--------------------------------		--------------------------------

Documentation/admin-guide/mm/index.rst

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@ the Linux memory management.
	ksm		ksm
	memory-hotplug		memory-hotplug
	numa_memory_policy		numa_memory_policy
			numaperf
	pagemap		pagemap
	soft-dirty		soft-dirty
	transhuge		transhuge