Skip to content

Commit cdc780f

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.4/amd-sfh' into for-linus
- assorted functional fixes for amd-sfh driver (Basavaraj Natikar)
2 parents 3851859 + 3738666 commit cdc780f

8,054 files changed

Lines changed: 273297 additions & 218318 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ ForEachMacros:
190190
- 'for_each_active_dev_scope'
191191
- 'for_each_active_drhd_unit'
192192
- 'for_each_active_iommu'
193+
- 'for_each_active_route'
193194
- 'for_each_aggr_pgid'
194195
- 'for_each_available_child_of_node'
195196
- 'for_each_bench'
@@ -225,7 +226,6 @@ ForEachMacros:
225226
- 'for_each_console_srcu'
226227
- 'for_each_cpu'
227228
- 'for_each_cpu_and'
228-
- 'for_each_cpu_not'
229229
- 'for_each_cpu_wrap'
230230
- 'for_each_dapm_widgets'
231231
- 'for_each_dedup_cand'

.gitattributes

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*.c diff=cpp
2-
*.h diff=cpp
3-
*.dtsi diff=dts
4-
*.dts diff=dts
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
*.[ch] diff=cpp
3+
*.dts diff=dts
4+
*.dts[io] diff=dts

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# subdirectories here. Add them in the ".gitignore" file
55
# in that subdirectory instead.
66
#
7-
# NOTE! Please use 'git ls-files -i --exclude-standard'
7+
# NOTE! Please use 'git ls-files -i -c --exclude-per-directory=.gitignore'
88
# command after changing this file, to see if there are
99
# any tracked files which get ignored after the change.
1010
#
@@ -16,6 +16,7 @@
1616
*.bin
1717
*.bz2
1818
*.c.[012]*.*
19+
*.cover
1920
*.dt.yaml
2021
*.dtb
2122
*.dtbo
@@ -33,6 +34,7 @@
3334
*.lz4
3435
*.lzma
3536
*.lzo
37+
*.mbx
3638
*.mod
3739
*.mod.c
3840
*.o
@@ -76,6 +78,7 @@ modules.order
7678
# RPM spec file (make rpm-pkg)
7779
#
7880
/*.spec
81+
/rpmbuild/
7982

8083
#
8184
# Debian directory (make deb-pkg)

.mailmap

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
2828
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
2929
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
3030
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
31+
Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>
3132
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3233
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3334
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
@@ -121,6 +122,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
121122
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
122123
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
123124
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
125+
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
124126
Dmitry Baryshkov <dbaryshkov@gmail.com>
125127
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
126128
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -131,10 +133,15 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
131133
Domen Puncer <domen@coderock.org>
132134
Douglas Gilbert <dougg@torque.net>
133135
Ed L. Cashin <ecashin@coraid.com>
136+
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
137+
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
134138
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
135139
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
136140
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
137141
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
142+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
143+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
144+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>
138145
Felipe W Damasio <felipewd@terra.com.br>
139146
Felix Kuhling <fxkuehl@gmx.de>
140147
Felix Moeller <felix@derklecks.de>
@@ -150,6 +157,7 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
150157
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
151158
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
152159
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
160+
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
153161
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
154162
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
155163
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
@@ -189,6 +197,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
189197
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
190198
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
191199
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
200+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
192201
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
193202
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
194203
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -208,6 +217,9 @@ Jens Axboe <axboe@suse.de>
208217
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
209218
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
210219
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
220+
Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
221+
Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
222+
Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>
211223
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
212224
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
213225
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -253,7 +265,9 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
253265
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
254266
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
255267
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
268+
Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
256269
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
270+
Leonard Göhrs <l.goehrs@pengutronix.de>
257271
Leonid I Ananiev <leonid.i.ananiev@intel.com>
258272
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
259273
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
@@ -304,6 +318,8 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
304318
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
305319
Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
306320
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
321+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
322+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
307323
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
308324
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
309325
Mayuresh Janorkar <mayur@ti.com>
@@ -367,6 +383,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
367383
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
368384
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
369385
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
386+
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>
370387
Rajesh Shah <rajesh.shah@intel.com>
371388
Ralf Baechle <ralf@linux-mips.org>
372389
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -375,6 +392,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
375392
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
376393
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
377394
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
395+
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
396+
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
397+
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
378398
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
379399
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
380400
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -385,6 +405,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
385405
Rudolf Marek <R.Marek@sh.cvut.cz>
386406
Rui Saraiva <rmps@joel.ist.utl.pt>
387407
Sachin P Sant <ssant@in.ibm.com>
408+
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
388409
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
389410
Sam Ravnborg <sam@mars.ravnborg.org>
390411
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -409,7 +430,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
409430
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
410431
Simon Kelley <simon@thekelleys.org.uk>
411432
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
412-
Stephen Hemminger <shemminger@osdl.org>
433+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
434+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
435+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>
436+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>
413437
Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
414438
Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>
415439
Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
@@ -422,6 +446,10 @@ Thomas Graf <tgraf@suug.ch>
422446
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
423447
Thomas Pedersen <twp@codeaurora.org>
424448
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
449+
Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>
450+
Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>
451+
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
452+
Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>
425453
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
426454
Tony Luck <tony.luck@intel.com>
427455
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
@@ -441,6 +469,7 @@ Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>
441469
Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>
442470
Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>
443471
Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
472+
Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
444473
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
445474
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
446475
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

CREDITS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,11 +1852,11 @@ E: ajoshi@shell.unixbox.com
18521852
D: fbdev hacking
18531853

18541854
N: Jesper Juhl
1855-
E: jj@chaosbits.net
1855+
E: jesperjuhl76@gmail.com
18561856
D: Various fixes, cleanups and minor features all over the tree.
18571857
D: Wrote initial version of the hdaps driver (since passed on to others).
1858-
S: Lemnosvej 1, 3.tv
1859-
S: 2300 Copenhagen S.
1858+
S: Titangade 5G, 2.tv
1859+
S: 2200 Copenhagen N.
18601860
S: Denmark
18611861

18621862
N: Jozsef Kadlecsik

Documentation/ABI/stable/sysfs-block

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,15 @@ Description:
705705
zoned will report "none".
706706

707707

708+
What: /sys/block/<disk>/hidden
709+
Date: March 2023
710+
Contact: linux-block@vger.kernel.org
711+
Description:
712+
[RO] the block device is hidden. it doesn’t produce events, and
713+
can’t be opened from userspace or using blkdev_get*.
714+
Used for the underlying components of multipath devices.
715+
716+
708717
What: /sys/block/<disk>/stat
709718
Date: February 2008
710719
Contact: Jerome Marchand <jmarchan@redhat.com>

Documentation/ABI/stable/sysfs-devices-node

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,42 @@ Date: November 2021
182182
Contact: Jarkko Sakkinen <jarkko@kernel.org>
183183
Description:
184184
The total amount of SGX physical memory in bytes.
185+
186+
What: /sys/devices/system/node/nodeX/memory_failure/total
187+
Date: January 2023
188+
Contact: Jiaqi Yan <jiaqiyan@google.com>
189+
Description:
190+
The total number of raw poisoned pages (pages containing
191+
corrupted data due to memory errors) on a NUMA node.
192+
193+
What: /sys/devices/system/node/nodeX/memory_failure/ignored
194+
Date: January 2023
195+
Contact: Jiaqi Yan <jiaqiyan@google.com>
196+
Description:
197+
Of the raw poisoned pages on a NUMA node, how many pages are
198+
ignored by memory error recovery attempt, usually because
199+
support for this type of pages is unavailable, and kernel
200+
gives up the recovery.
201+
202+
What: /sys/devices/system/node/nodeX/memory_failure/failed
203+
Date: January 2023
204+
Contact: Jiaqi Yan <jiaqiyan@google.com>
205+
Description:
206+
Of the raw poisoned pages on a NUMA node, how many pages are
207+
failed by memory error recovery attempt. This usually means
208+
a key recovery operation failed.
209+
210+
What: /sys/devices/system/node/nodeX/memory_failure/delayed
211+
Date: January 2023
212+
Contact: Jiaqi Yan <jiaqiyan@google.com>
213+
Description:
214+
Of the raw poisoned pages on a NUMA node, how many pages are
215+
delayed by memory error recovery attempt. Delayed poisoned
216+
pages usually will be retried by kernel.
217+
218+
What: /sys/devices/system/node/nodeX/memory_failure/recovered
219+
Date: January 2023
220+
Contact: Jiaqi Yan <jiaqiyan@google.com>
221+
Description:
222+
Of the raw poisoned pages on a NUMA node, how many pages are
223+
recovered by memory error recovery attempt.

Documentation/ABI/testing/configfs-usb-gadget

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,16 @@ Description:
143143
qw_sign an identifier to be reported as "OS String"
144144
proper
145145
============= ===============================================
146+
147+
What: /config/usb-gadget/gadget/webusb
148+
Date: Dec 2022
149+
KernelVersion: 6.3
150+
Description:
151+
This group contains "WebUSB" extension handling attributes.
152+
153+
============= ===============================================
154+
use flag turning "WebUSB" support on/off
155+
bcdVersion bcd WebUSB specification version number
156+
bVendorCode one-byte value used for custom per-device
157+
landingPage UTF-8 encoded URL of the device's landing page
158+
============= ===============================================

Documentation/ABI/testing/configfs-usb-gadget-uvc

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ Date: Dec 2014
1515
KernelVersion: 4.0
1616
Description: Control descriptors
1717

18-
All attributes read only:
18+
All attributes read only except enable_interrupt_ep:
1919

20-
================ =============================
20+
=================== =============================
2121
bInterfaceNumber USB interface number for this
2222
streaming interface
23-
================ =============================
23+
enable_interrupt_ep flag to enable the interrupt
24+
endpoint for the VC interface
25+
=================== =============================
2426

2527
What: /config/usb-gadget/gadget/functions/uvc.name/control/class
2628
Date: Dec 2014
@@ -52,7 +54,7 @@ Date: Dec 2014
5254
KernelVersion: 4.0
5355
Description: Default output terminal descriptors
5456

55-
All attributes read only:
57+
All attributes read only except bSourceID:
5658

5759
============== =============================================
5860
iTerminal index of string descriptor
@@ -111,6 +113,34 @@ Description: Default processing unit descriptors
111113
bUnitID a non-zero id of this unit
112114
=============== ========================================
113115

116+
What: /config/usb-gadget/gadget/functions/uvc.name/control/extensions
117+
Date: Nov 2022
118+
KernelVersion: 6.1
119+
Description: Extension unit descriptors
120+
121+
What: /config/usb-gadget/gadget/functions/uvc.name/control/extensions/name
122+
Date: Nov 2022
123+
KernelVersion: 6.1
124+
Description: Extension Unit (XU) Descriptor
125+
126+
bLength, bUnitID and iExtension are read-only. All others are
127+
read-write.
128+
129+
================= ========================================
130+
bLength size of the descriptor in bytes
131+
bUnitID non-zero ID of this unit
132+
guidExtensionCode Vendor-specific code identifying the XU
133+
bNumControls number of controls in this XU
134+
bNrInPins number of input pins for this unit
135+
baSourceID list of the IDs of the units or terminals
136+
to which this XU is connected
137+
bControlSize size of the bmControls field in bytes
138+
bmControls list of bitmaps detailing which vendor
139+
specific controls are supported
140+
iExtension index of a string descriptor that describes
141+
this extension unit
142+
================= ========================================
143+
114144
What: /config/usb-gadget/gadget/functions/uvc.name/control/header
115145
Date: Dec 2014
116146
KernelVersion: 4.0
@@ -165,7 +195,24 @@ Date: Dec 2014
165195
KernelVersion: 4.0
166196
Description: Default color matching descriptors
167197

168-
All attributes read only:
198+
All attributes read/write:
199+
200+
======================== ======================================
201+
bMatrixCoefficients matrix used to compute luma and
202+
chroma values from the color primaries
203+
bTransferCharacteristics optoelectronic transfer
204+
characteristic of the source picture,
205+
also called the gamma function
206+
bColorPrimaries color primaries and the reference
207+
white
208+
======================== ======================================
209+
210+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/name
211+
Date: Dec 2022
212+
KernelVersion: 6.3
213+
Description: Additional color matching descriptors
214+
215+
All attributes read/write:
169216

170217
======================== ======================================
171218
bMatrixCoefficients matrix used to compute luma and

0 commit comments

Comments
 (0)