Skip to content

Commit ec496f7

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.20/sony' into for-linus
- Support for Rock band 4 PS4 and PS5 guitars (Rosalie Wanders)
2 parents 984d6f3 + ae40ace commit ec496f7

5,835 files changed

Lines changed: 248662 additions & 76837 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ ForEachMacros:
140140
- 'damon_for_each_scheme_safe'
141141
- 'damon_for_each_target'
142142
- 'damon_for_each_target_safe'
143-
- 'damos_for_each_filter'
144-
- 'damos_for_each_filter_safe'
143+
- 'damos_for_each_core_filter'
144+
- 'damos_for_each_core_filter_safe'
145145
- 'damos_for_each_ops_filter'
146146
- 'damos_for_each_ops_filter_safe'
147147
- 'damos_for_each_quota_goal'
@@ -415,6 +415,7 @@ ForEachMacros:
415415
- 'for_each_prop_dlc_cpus'
416416
- 'for_each_prop_dlc_platforms'
417417
- 'for_each_property_of_node'
418+
- 'for_each_pt_level_entry'
418419
- 'for_each_rdt_resource'
419420
- 'for_each_reg'
420421
- 'for_each_reg_filtered'
@@ -747,6 +748,7 @@ ForEachMacros:
747748
- 'ynl_attr_for_each_nested'
748749
- 'ynl_attr_for_each_payload'
749750
- 'zorro_for_each_dev'
751+
- 'zpci_bus_for_each'
750752

751753
IncludeBlocks: Preserve
752754
IncludeCategories:

.mailmap

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ Barry Song <baohua@kernel.org> <Baohua.Song@csr.com>
127127
Barry Song <baohua@kernel.org> <barry.song@analog.com>
128128
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
129129
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
130-
Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>
130+
Bartosz Golaszewski <brgl@kernel.org> <bartosz.golaszewski@linaro.org>
131+
Bartosz Golaszewski <brgl@kernel.org> <bgolaszewski@baylibre.com>
131132
Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>
132133
Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>
133134
Ben Gardner <bgardner@wabtec.com>
@@ -186,6 +187,9 @@ Christian Brauner <brauner@kernel.org> <christian@brauner.io>
186187
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
187188
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
188189
Christian Marangi <ansuelsmth@gmail.com>
190+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy@c-s.fr>
191+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy@csgroup.eu>
192+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy2@cs-soprasteria.com>
189193
Christophe Ricard <christophe.ricard@gmail.com>
190194
Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
191195
Christoph Hellwig <hch@lst.de>
@@ -300,6 +304,7 @@ Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>
300304
Hans Verkuil <hverkuil@kernel.org> <hverkuil@xs4all.nl>
301305
Hans Verkuil <hverkuil@kernel.org> <hverkuil-cisco@xs4all.nl>
302306
Hans Verkuil <hverkuil@kernel.org> <hansverk@cisco.com>
307+
Hao Ge <hao.ge@linux.dev> <gehao@kylinos.cn>
303308
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
304309
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
305310
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
@@ -345,7 +350,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
345350
Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
346351
Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
347352
Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
348-
<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
353+
Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe.brucker@arm.com>
354+
Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe@linaro.org>
349355
Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org> <jeanmichel.hautbois@ideasonboard.com>
350356
Jean Tourrilhes <jt@hpl.hp.com>
351357
Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>
@@ -499,9 +505,7 @@ Mark Brown <broonie@sirena.org.uk>
499505
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
500506
Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de>
501507
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
502-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
503-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
504-
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
508+
Martin Kepplinger-Novakovic <martink@posteo.de> <martin.kepplinger-novakovic@ginzinger.com>
505509
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
506510
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
507511
Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>
@@ -701,6 +705,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
701705
Santosh Shilimkar <santosh.shilimkar@oracle.org>
702706
Santosh Shilimkar <ssantosh@kernel.org>
703707
Sarangdhar Joshi <spjoshi@codeaurora.org>
708+
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
709+
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
704710
Sascha Hauer <s.hauer@pengutronix.de>
705711
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
706712
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
@@ -852,6 +858,8 @@ Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
852858
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
853859
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
854860
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
861+
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
862+
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
855863
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
856864
WeiXiong Liao <gmpy.liaowx@gmail.com> <liaoweixiong@allwinnertech.com>
857865
Wen Gong <quic_wgong@quicinc.com> <wgong@codeaurora.org>
@@ -863,6 +871,7 @@ Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
863871
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
864872
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
865873
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
874+
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
866875
Yusuke Goda <goda.yusuke@renesas.com>
867876
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
868877
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ D: One of assisting postmasters for vger.kernel.org's lists
1616
S: (ask for current address)
1717
S: Finland
1818

19+
N: Kishon Vijay Abraham I
20+
E: kishon@kernel.org
21+
D: Generic Phy Framework
22+
1923
N: Thomas Abraham
2024
E: thomas.ab@samsung.com
2125
D: Samsung pin controller driver
@@ -1983,6 +1987,7 @@ D: netfilter: TCP window tracking code
19831987
D: netfilter: raw table
19841988
D: netfilter: iprange match
19851989
D: netfilter: new logging interfaces
1990+
D: netfilter: ipset
19861991
D: netfilter: various other hacks
19871992
S: Tata
19881993
S: Hungary
@@ -2056,16 +2061,15 @@ S: Korte Heul 95
20562061
S: 1403 ND BUSSUM
20572062
S: The Netherlands
20582063

2059-
N: Martin Kepplinger
2064+
N: Martin Kepplinger-Novakovic
20602065
E: martink@posteo.de
2061-
E: martin.kepplinger@puri.sm
2062-
W: http://www.martinkepplinger.com
20632066
P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468 6E3F 5003 98DF 5AB3 87D3
20642067
D: mma8452 accelerators iio driver
20652068
D: pegasus_notetaker input driver
2069+
D: imx8m media and hi846 sensor driver
20662070
D: Kernel fixes and cleanups
2067-
S: Garnisonstraße 26
2068-
S: 4020 Linz
2071+
S: Keplerstr. 6
2072+
S: 4050 Traun
20692073
S: Austria
20702074

20712075
N: Karl Keyte
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
NOTE: all the ABIs listed in this file are deprecated and will be removed after 2028.
2+
3+
Here are the alternative ABIs:
4+
+------------------------------------+-----------------------------------------+
5+
| Deprecated | Alternative |
6+
+------------------------------------+-----------------------------------------+
7+
| /sys/kernel/kexec_loaded | /sys/kernel/kexec/loaded |
8+
+------------------------------------+-----------------------------------------+
9+
| /sys/kernel/kexec_crash_loaded | /sys/kernel/kexec/crash_loaded |
10+
+------------------------------------+-----------------------------------------+
11+
| /sys/kernel/kexec_crash_size | /sys/kernel/kexec/crash_size |
12+
+------------------------------------+-----------------------------------------+
13+
| /sys/kernel/crash_elfcorehdr_size | /sys/kernel/kexec/crash_elfcorehdr_size |
14+
+------------------------------------+-----------------------------------------+
15+
| /sys/kernel/kexec_crash_cma_ranges | /sys/kernel/kexec/crash_cma_ranges |
16+
+------------------------------------+-----------------------------------------+
17+
18+
19+
What: /sys/kernel/kexec_loaded
20+
Date: Jun 2006
21+
Contact: kexec@lists.infradead.org
22+
Description: read only
23+
Indicates whether a new kernel image has been loaded
24+
into memory using the kexec system call. It shows 1 if
25+
a kexec image is present and ready to boot, or 0 if none
26+
is loaded.
27+
User: kexec tools, kdump service
28+
29+
What: /sys/kernel/kexec_crash_loaded
30+
Date: Jun 2006
31+
Contact: kexec@lists.infradead.org
32+
Description: read only
33+
Indicates whether a crash (kdump) kernel is currently
34+
loaded into memory. It shows 1 if a crash kernel has been
35+
successfully loaded for panic handling, or 0 if no crash
36+
kernel is present.
37+
User: Kexec tools, Kdump service
38+
39+
What: /sys/kernel/kexec_crash_size
40+
Date: Dec 2009
41+
Contact: kexec@lists.infradead.org
42+
Description: read/write
43+
Shows the amount of memory reserved for loading the crash
44+
(kdump) kernel. It reports the size, in bytes, of the
45+
crash kernel area defined by the crashkernel= parameter.
46+
This interface also allows reducing the crashkernel
47+
reservation by writing a smaller value, and the reclaimed
48+
space is added back to the system RAM.
49+
User: Kdump service
50+
51+
What: /sys/kernel/crash_elfcorehdr_size
52+
Date: Aug 2023
53+
Contact: kexec@lists.infradead.org
54+
Description: read only
55+
Indicates the preferred size of the memory buffer for the
56+
ELF core header used by the crash (kdump) kernel. It defines
57+
how much space is needed to hold metadata about the crashed
58+
system, including CPU and memory information. This information
59+
is used by the user space utility kexec to support updating the
60+
in-kernel kdump image during hotplug operations.
61+
User: Kexec tools
62+
63+
What: /sys/kernel/kexec_crash_cma_ranges
64+
Date: Nov 2025
65+
Contact: kexec@lists.infradead.org
66+
Description: read only
67+
Provides information about the memory ranges reserved from
68+
the Contiguous Memory Allocator (CMA) area that are allocated
69+
to the crash (kdump) kernel. It lists the start and end physical
70+
addresses of CMA regions assigned for crashkernel use.
71+
User: kdump service

Documentation/ABI/testing/rtc-cdev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Description:
1414
for RTCs that support alarms
1515

1616
* RTC_ALM_READ, RTC_ALM_SET: Read or set the alarm time for
17-
RTCs that support alarms. Can be set upto 24 hours in the
17+
RTCs that support alarms. Can be set up to 24 hours in the
1818
future. Requires a separate RTC_AIE_ON call to enable the
1919
alarm interrupt. (Prefer to use RTC_WKALM_*)
2020

Documentation/ABI/testing/sysfs-bus-cxl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,17 @@ Description:
496496
changed, only freed by writing 0. The kernel makes no guarantees
497497
that data is maintained over an address space freeing event, and
498498
there is no guarantee that a free followed by an allocate
499-
results in the same address being allocated.
499+
results in the same address being allocated. If extended linear
500+
cache is present, the size indicates extended linear cache size
501+
plus the CXL region size.
500502

503+
What: /sys/bus/cxl/devices/regionZ/extended_linear_cache_size
504+
Date: October, 2025
505+
KernelVersion: v6.19
506+
Contact: linux-cxl@vger.kernel.org
507+
Description:
508+
(RO) The size of extended linear cache, if there is an extended
509+
linear cache. Otherwise the attribute will not be visible.
501510

502511
What: /sys/bus/cxl/devices/regionZ/mode
503512
Date: January, 2023

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,7 @@ What: /sys/.../iio:deviceX/events/in_tempY_thresh_rising_en
898898
What: /sys/.../iio:deviceX/events/in_tempY_thresh_falling_en
899899
What: /sys/.../iio:deviceX/events/in_capacitanceY_thresh_rising_en
900900
What: /sys/.../iio:deviceX/events/in_capacitanceY_thresh_falling_en
901+
What: /sys/.../iio:deviceX/events/in_pressure_thresh_rising_en
901902
KernelVersion: 2.6.37
902903
Contact: linux-iio@vger.kernel.org
903904
Description:
@@ -926,6 +927,7 @@ What: /sys/.../iio:deviceX/events/in_accel_y_roc_rising_en
926927
What: /sys/.../iio:deviceX/events/in_accel_y_roc_falling_en
927928
What: /sys/.../iio:deviceX/events/in_accel_z_roc_rising_en
928929
What: /sys/.../iio:deviceX/events/in_accel_z_roc_falling_en
930+
What: /sys/.../iio:deviceX/events/in_accel_x&y&z_roc_rising_en
929931
What: /sys/.../iio:deviceX/events/in_anglvel_x_roc_rising_en
930932
What: /sys/.../iio:deviceX/events/in_anglvel_x_roc_falling_en
931933
What: /sys/.../iio:deviceX/events/in_anglvel_y_roc_rising_en
@@ -1001,6 +1003,7 @@ Description:
10011003
to the raw signal, allowing slow tracking to resume and the
10021004
adaptive threshold event detection to function as expected.
10031005

1006+
What: /sys/.../events/in_accel_mag_adaptive_rising_value
10041007
What: /sys/.../events/in_accel_thresh_rising_value
10051008
What: /sys/.../events/in_accel_thresh_falling_value
10061009
What: /sys/.../events/in_accel_x_raw_thresh_rising_value
@@ -1045,6 +1048,7 @@ What: /sys/.../events/in_capacitanceY_thresh_rising_value
10451048
What: /sys/.../events/in_capacitanceY_thresh_falling_value
10461049
What: /sys/.../events/in_capacitanceY_thresh_adaptive_rising_value
10471050
What: /sys/.../events/in_capacitanceY_thresh_falling_rising_value
1051+
What: /sys/.../events/in_pressure_thresh_rising_value
10481052
KernelVersion: 2.6.37
10491053
Contact: linux-iio@vger.kernel.org
10501054
Description:
@@ -1147,6 +1151,7 @@ Description:
11471151
will get activated once in_voltage0_raw goes above 1200 and will become
11481152
deactivated again once the value falls below 1150.
11491153

1154+
What: /sys/.../events/in_accel_roc_rising_value
11501155
What: /sys/.../events/in_accel_x_raw_roc_rising_value
11511156
What: /sys/.../events/in_accel_x_raw_roc_falling_value
11521157
What: /sys/.../events/in_accel_y_raw_roc_rising_value
@@ -1193,6 +1198,8 @@ Description:
11931198
value is in raw device units or in processed units (as _raw
11941199
and _input do on sysfs direct channel read attributes).
11951200

1201+
What: /sys/.../events/in_accel_mag_adaptive_rising_period
1202+
What: /sys/.../events/in_accel_roc_rising_period
11961203
What: /sys/.../events/in_accel_x_thresh_rising_period
11971204
What: /sys/.../events/in_accel_x_thresh_falling_period
11981205
What: /sys/.../events/in_accel_x_roc_rising_period
@@ -1362,6 +1369,15 @@ Description:
13621369
number or direction is not specified, applies to all channels of
13631370
this type.
13641371

1372+
What: /sys/.../iio:deviceX/events/in_accel_x_mag_adaptive_rising_en
1373+
What: /sys/.../iio:deviceX/events/in_accel_y_mag_adaptive_rising_en
1374+
What: /sys/.../iio:deviceX/events/in_accel_z_mag_adaptive_rising_en
1375+
KernelVersion: 2.6.37
1376+
Contact: linux-iio@vger.kernel.org
1377+
Description:
1378+
Similar to in_accel_x_thresh[_rising|_falling]_en, but here the
1379+
magnitude of the channel is compared to the adaptive threshold.
1380+
13651381
What: /sys/.../iio:deviceX/events/in_accel_mag_referenced_en
13661382
What: /sys/.../iio:deviceX/events/in_accel_mag_referenced_rising_en
13671383
What: /sys/.../iio:deviceX/events/in_accel_mag_referenced_falling_en
@@ -2422,3 +2438,23 @@ Description:
24222438
Value representing the user's attention to the system expressed
24232439
in units as percentage. This usually means if the user is
24242440
looking at the screen or not.
2441+
2442+
What: /sys/.../events/in_accel_value_available
2443+
KernelVersion: 6.18
2444+
Contact: linux-iio@vger.kernel.org
2445+
Description:
2446+
List of available threshold values for acceleration event
2447+
generation. Applies to all event types on in_accel channels.
2448+
Units after application of scale and offset are m/s^2.
2449+
Expressed as:
2450+
2451+
- a range specified as "[min step max]"
2452+
2453+
What: /sys/.../events/in_accel_period_available
2454+
KernelVersion: 6.18
2455+
Contact: linux-iio@vger.kernel.org
2456+
Description:
2457+
List of available periods for accelerometer event detection in
2458+
seconds, expressed as:
2459+
2460+
- a range specified as "[min step max]"

0 commit comments

Comments
 (0)