Commit be887fca authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 6.13-rc4 into char-misc-next 



We need the IIO fixes in here as well, and it resolves a merge conflict
in:
	drivers/iio/adc/ti-ads1119.c

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 44cefdf1 5bc55a33

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com> 
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>

Bingwu Zhang <xtex@aosc.io> <xtexchooser@duck.com>

Bingwu Zhang <xtex@aosc.io> <xtex@xtexx.eu.org>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>
@@ -435,7 +437,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 +737,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>

CREDITS

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ N: Thomas Abraham 
E: thomas.ab@samsung.com

D: Samsung pin controller driver



N: Jose Abreu

E: jose.abreu@synopsys.com

D: Synopsys DesignWare XPCS MDIO/PCS driver.



N: Dragos Acostachioaie

E: dragos@iname.com

W: http://www.arbornet.org/~dragos
@@ -1428,6 +1432,10 @@ S: 8124 Constitution Apt. 7 
S: Sterling Heights, Michigan 48313

S: USA



N: Andy Gospodarek

E: andy@greyhouse.net

D: Maintenance and contributions to the network interface bonding driver.



N: Wolfgang Grandegger

E: wg@grandegger.com

D: Controller Area Network (device drivers)
@@ -1812,6 +1820,10 @@ D: Author/maintainer of most DRM drivers (especially ATI, MGA) 
D: Core DRM templates, general DRM and 3D-related hacking

S: No fixed address



N: Woojung Huh

E: woojung.huh@microchip.com

D: Microchip LAN78XX USB Ethernet driver



N: Kenn Humborg

E: kenn@wombat.ie

D: Mods to loop device to support sparse backing files

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

Documentation/admin-guide/pm/amd-pstate.rst

+1 −3
Original line number Diff line number Diff line
@@ -251,9 +251,7 @@ performance supported in `AMD CPPC Performance Capability <perf_cap_>`_). 
In some ASICs, the highest CPPC performance is not the one in the ``_CPC``

table, so we need to expose it to sysfs. If boost is not active, but

still supported, this maximum frequency will be larger than the one in

``cpuinfo``. On systems that support preferred core, the driver will have

different values for some cores than others and this will reflect the values

advertised by the platform at bootup.

``cpuinfo``.

This attribute is read-only.



``amd_pstate_lowest_nonlinear_freq``