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

Commit 58005719 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v5.2-rc4' into media/master 



There are some conflicts due to SPDX changes. We also have more
patches being merged via media tree touching them.

So, let's merge back from upstream and address those.

Linux 5.2-rc4

* tag 'v5.2-rc4': (767 commits)
  Linux 5.2-rc4
  MAINTAINERS: Karthikeyan Ramasubramanian is MIA
  i2c: xiic: Add max_read_len quirk
  lockref: Limit number of cmpxchg loop retries
  uaccess: add noop untagged_addr definition
  x86/insn-eval: Fix use-after-free access to LDT entry
  kbuild: use more portable 'command -v' for cc-cross-prefix
  s390/unwind: correct stack switching during unwind
  block, bfq: add weight symlink to the bfq.weight cgroup parameter
  cgroup: let a symlink too be created with a cftype file
  drm/nouveau/secboot/gp10[2467]: support newer FW to fix SEC2 failures on some boards
  drm/nouveau/secboot: enable loading of versioned LS PMU/SEC2 ACR msgqueue FW
  drm/nouveau/secboot: split out FW version-specific LS function pointers
  drm/nouveau/secboot: pass max supported FW version to LS load funcs
  drm/nouveau/core: support versioned firmware loading
  drm/nouveau/core: pass subdev into nvkm_firmware_get, rather than device
  block: free sched's request pool in blk_cleanup_queue
  pktgen: do not sleep with the thread lock held.
  net: mvpp2: Use strscpy to handle stat strings
  net: rds: fix memory leak in rds_ib_flush_mr_pool
  ...

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parents d17589af d1fdb6d8

CREDITS

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

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

E: tpmdd@selhorst.net

D: TPM driver

Documentation/ABI/testing/sysfs-bus-mdio

deleted100644 → 0
+0 −29
Original line number 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 Diff line number Diff line
@@ -11,24 +11,31 @@ Date: February 2014 
KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		Boolean value indicating whether the PHY device has

		any fixups registered against it (phy_register_fixup)

		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.



What:		/sys/class/mdio_bus/<bus>/<device>/phy_id

Date:		November 2012

KernelVersion:	3.8

Contact:	netdev@vger.kernel.org

Description:

		32-bit hexadecimal value corresponding to the PHY device's OUI,

		model and revision number.

		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/class/mdio_bus/<bus>/<device>/phy_interface

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		String value indicating the PHY interface, possible

		values are:.

		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.

		Possible values are:

		<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,

		rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii

		xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,

Documentation/admin-guide/cgroup-v2.rst

+9 −0
Original line number 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

	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

--------------------------------

Documentation/admin-guide/mm/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ the Linux memory management. 
   ksm

   memory-hotplug

   numa_memory_policy

   numaperf

   pagemap

   soft-dirty

   transhuge