Merge drm/drm-next into drm-misc-next-fixes (12080e85) · Commits · git / linux-net

.mailmap

+2 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,7 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
		Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
		Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>
		Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
		Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>
		Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>
		Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
		@@ -735,6 +735,7 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
		Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
		Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
		Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
		Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
		Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

Documentation/admin-guide/cgroup-v2.rst

+51 −7

Original line number	Diff line number	Diff line
		@@ -64,13 +64,14 @@ v1 is available under :ref:`Documentation/admin-guide/cgroup-v1/index.rst <cgrou
		5-6. Device
		5-7. RDMA
		5-7-1. RDMA Interface Files
		5-8. HugeTLB
		5.8-1. HugeTLB Interface Files
		5-9. Misc
		5.9-1 Miscellaneous cgroup Interface Files
		5.9-2 Migration and Ownership
		5-10. Others
		5-10-1. perf_event
		5-8. DMEM
		5-9. HugeTLB
		5.9-1. HugeTLB Interface Files
		5-10. Misc
		5.10-1 Miscellaneous cgroup Interface Files
		5.10-2 Migration and Ownership
		5-11. Others
		5-11-1. perf_event
		5-N. Non-normative information
		5-N-1. CPU controller root cgroup process behaviour
		5-N-2. IO controller root cgroup process behaviour
		@@ -2626,6 +2627,49 @@ RDMA Interface Files
		mlx4_0 hca_handle=1 hca_object=20
		ocrdma1 hca_handle=1 hca_object=23

		DMEM
		----

		The "dmem" controller regulates the distribution and accounting of
		device memory regions. Because each memory region may have its own page size,
		which does not have to be equal to the system page size, the units are always bytes.

		DMEM Interface Files
		~~~~~~~~~~~~~~~~~~~~

		dmem.max, dmem.min, dmem.low
		A readwrite nested-keyed file that exists for all the cgroups
		except root that describes current configured resource limit
		for a region.

		An example for xe follows::

		drm/0000:03:00.0/vram0 1073741824
		drm/0000:03:00.0/stolen max

		The semantics are the same as for the memory cgroup controller, and are
		calculated in the same way.

		dmem.capacity
		A read-only file that describes maximum region capacity.
		It only exists on the root cgroup. Not all memory can be
		allocated by cgroups, as the kernel reserves some for
		internal use.

		An example for xe follows::

		drm/0000:03:00.0/vram0 8514437120
		drm/0000:03:00.0/stolen 67108864

		dmem.current
		A read-only file that describes current resource usage.
		It exists for all the cgroup except root.

		An example for xe follows::

		drm/0000:03:00.0/vram0 12550144
		drm/0000:03:00.0/stolen 8650752

		HugeTLB
		-------

Documentation/admin-guide/kernel-parameters.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -4822,6 +4822,11 @@
		can be preempted anytime. Tasks will also yield
		contended spinlocks (if the critical section isn't
		explicitly preempt disabled beyond the lock itself).
		lazy - Scheduler controlled. Similar to full but instead
		of preempting the task immediately, the task gets
		one HZ tick time to yield itself before the
		preemption will be forced. One preemption is when the
		task returns to user space.

		print-fatal-signals=
		[KNL] debug: print fatal signals

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+7 −3

Original line number	Diff line number	Diff line
		@@ -445,8 +445,10 @@ event code Key Notes
		0x1008 0x07 FN+F8 IBM: toggle screen expand
		Lenovo: configure UltraNav,
		or toggle screen expand.
		On newer platforms (2024+)
		replaced by 0x131f (see below)
		On 2024 platforms replaced by
		0x131f (see below) and on newer
		platforms (2025 +) keycode is
		replaced by 0x1401 (see below).

		0x1009 0x08 FN+F9 -

		@@ -506,9 +508,11 @@ event code Key Notes

		0x1019 0x18 unknown

		0x131f ... FN+F8 Platform Mode change.
		0x131f ... FN+F8 Platform Mode change (2024 systems).
		Implemented in driver.

		0x1401 ... FN+F8 Platform Mode change (2025 + systems).
		Implemented in driver.
		... ... ...

		0x1020 0x1F unknown

Documentation/admin-guide/mm/transhuge.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -436,7 +436,7 @@ AnonHugePmdMapped).
		The number of file transparent huge pages mapped to userspace is available
		by reading ShmemPmdMapped and ShmemHugePages fields in ``/proc/meminfo``.
		To identify what applications are mapping file transparent huge pages, it
		is necessary to read ``/proc/PID/smaps`` and count the FileHugeMapped fields
		is necessary to read ``/proc/PID/smaps`` and count the FilePmdMapped fields
		for each mapping.

		Note that reading the smaps file is expensive and reading it