Commit aebd8f0c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge v6.2-rc6 into drm-next 



Due to holidays we started -next with more -fixes in-flight than
usual, and people have been asking where they are. Backmerge to get
things better in sync.

Conflicts:
- Tiny conflict in drm_fbdev_generic.c between variable rename and
  missing error handling that got added.
- Conflict in drm_fb_helper.c between the added call to vgaswitcheroo
  in drm_fb_helper_single_fb_probe and a refactor patch that extracted
  lots of helpers and incidentally removed the dev local variable.
  Readd it to make things compile.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 155c6b16 6d796c50

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
@@ -422,6 +423,7 @@ Tony Luck <tony.luck@intel.com> 
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -2489,6 +2489,13 @@ D: XF86_Mach8 
D: XF86_8514

D: cfdisk (curses based disk partitioning program)



N: Mat Martineau

E: mat@martineau.name

D: MPTCP subsystem co-maintainer 2020-2023

D: Keyctl restricted keyring and Diffie-Hellman UAPI

D: Bluetooth L2CAP ERTM mode and AMP

S: USA



N: John S. Marvin

E: jsm@fc.hp.com

D: PA-RISC port

Documentation/ABI/testing/debugfs-pktcdvd

0 → 100644
+18 −0
Original line number Diff line number Diff line 
What:           /sys/kernel/debug/pktcdvd/pktcdvd[0-7]

Date:           Oct. 2006

KernelVersion:  2.6.20

Contact:        Thomas Maier <balagi@justmail.de>

Description:



The pktcdvd module (packet writing driver) creates

these files in debugfs:



/sys/kernel/debug/pktcdvd/pktcdvd[0-7]/



    ====            ====== ====================================

    info            0444   Lots of driver statistics and infos.

    ====            ====== ====================================



Example::



    cat /sys/kernel/debug/pktcdvd/pktcdvd0/info

Documentation/ABI/testing/sysfs-class-pktcdvd

0 → 100644
+97 −0
Original line number Diff line number Diff line 
sysfs interface

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

The pktcdvd module (packet writing driver) creates the following files in the

sysfs: (<devid> is in the format major:minor)



What:		/sys/class/pktcdvd/add

What:		/sys/class/pktcdvd/remove

What:		/sys/class/pktcdvd/device_map

Date:		Oct. 2006

KernelVersion:	2.6.20

Contact:	Thomas Maier <balagi@justmail.de>

Description:



		==========	==============================================

		add		(WO) Write a block device id (major:minor) to

				create a new pktcdvd device and map it to the

				block device.



		remove		(WO) Write the pktcdvd device id (major:minor)

				to remove the pktcdvd device.



		device_map	(RO) Shows the device mapping in format:

				pktcdvd[0-7] <pktdevid> <blkdevid>

		==========	==============================================





What:		/sys/class/pktcdvd/pktcdvd[0-7]/dev

What:		/sys/class/pktcdvd/pktcdvd[0-7]/uevent

Date:		Oct. 2006

KernelVersion:	2.6.20

Contact:	Thomas Maier <balagi@justmail.de>

Description:

		dev:	(RO) Device id



		uevent:	(WO) To send a uevent





What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_started

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_finished

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_written

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read_gather

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/reset

Date:		Oct. 2006

KernelVersion:	2.6.20

Contact:	Thomas Maier <balagi@justmail.de>

Description:

		packets_started:	(RO) Number of started packets.



		packets_finished:	(RO) Number of finished packets.



		kb_written:		(RO) kBytes written.



		kb_read:		(RO) kBytes read.



		kb_read_gather:		(RO) kBytes read to fill write packets.



		reset:			(WO) Write any value to it to reset

					pktcdvd device statistic values, like

					bytes read/written.





What:		/sys/class/pktcdvd/pktcdvd[0-7]/write_queue/size

What:		/sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_off

What:		/sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_on

Date:		Oct. 2006

KernelVersion:	2.6.20

Contact:	Thomas Maier <balagi@justmail.de>

Description:

		==============	================================================

		size		(RO) Contains the size of the bio write queue.



		congestion_off	(RW) If bio write queue size is below this mark,

				accept new bio requests from the block layer.



		congestion_on	(RW) If bio write queue size is higher as this

				mark, do no longer accept bio write requests

				from the block layer and wait till the pktcdvd

				device has processed enough bio's so that bio

				write queue size is below congestion off mark.

				A value of <= 0 disables congestion control.

		==============	================================================





Example:

--------

To use the pktcdvd sysfs interface directly, you can do::



    # create a new pktcdvd device mapped to /dev/hdc

    echo "22:0" >/sys/class/pktcdvd/add

    cat /sys/class/pktcdvd/device_map

    # assuming device pktcdvd0 was created, look at stat's

    cat /sys/class/pktcdvd/pktcdvd0/stat/kb_written

    # print the device id of the mapped block device

    fgrep pktcdvd0 /sys/class/pktcdvd/device_map

    # remove device, using pktcdvd0 device id   253:0

    echo "253:0" >/sys/class/pktcdvd/remove

Documentation/admin-guide/mm/zswap.rst

+1 −3
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ e.g. ``zswap.zpool=zbud``. It can also be changed at runtime using the sysfs 
The zbud type zpool allocates exactly 1 page to store 2 compressed pages, which

means the compression ratio will always be 2:1 or worse (because of half-full

zbud pages).  The zsmalloc type zpool has a more complex compressed page

storage method, and it can achieve greater storage densities.  However,

zsmalloc does not implement compressed page eviction, so once zswap fills it

cannot evict the oldest page, it can only reject new pages.

storage method, and it can achieve greater storage densities.



When a swap page is passed from frontswap to zswap, zswap maintains a mapping

of the swap entry, a combination of the swap type and swap offset, to the zpool