Skip to content

Commit

Permalink
Merge tag 'v5.17-rc4' into for-linus
Browse files Browse the repository at this point in the history
Merge with mainline to get the Intel ASoC generic helpers header and
other changes.
  • Loading branch information
dtor committed Mar 1, 2022
2 parents ba115ad + 754e0b0 commit 1136fa0
Show file tree
Hide file tree
Showing 18,638 changed files with 1,153,225 additions and 483,581 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ ForEachMacros:
- 'for_each_migratetype_order'
- 'for_each_msi_entry'
- 'for_each_msi_entry_safe'
- 'for_each_msi_vector'
- 'for_each_net'
- 'for_each_net_continue_reverse'
- 'for_each_netdev'
Expand Down
24 changes: 24 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
# Please keep this list dictionary sorted.
#
Aaron Durbin <[email protected]>
Abhinav Kumar <[email protected]> <[email protected]>
Adam Oldham <[email protected]>
Adam Radford <[email protected]>
Adriana Reus <[email protected]> <[email protected]>
Adrian Bunk <[email protected]>
Akhil P Oommen <[email protected]> <[email protected]>
Alan Cox <[email protected]>
Alan Cox <[email protected]>
Aleksandar Markovic <[email protected]> <[email protected]>
Expand Down Expand Up @@ -42,14 +44,17 @@ Andrew Vasquez <[email protected]>
Andrey Konovalov <[email protected]> <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrzej Hajda <[email protected]> <[email protected]>
Andy Adamson <[email protected]>
Antoine Tenart <[email protected]> <[email protected]>
Antoine Tenart <[email protected]> <[email protected]>
Antonio Ospite <[email protected]> <[email protected]>
Anup Patel <[email protected]> <[email protected]>
Archit Taneja <[email protected]>
Ard Biesheuvel <[email protected]> <[email protected]>
Arnaud Patard <[email protected]>
Arnd Bergmann <[email protected]>
Atish Patra <[email protected]> <[email protected]>
Axel Dyks <[email protected]>
Axel Lin <[email protected]>
Bart Van Assche <[email protected]> <[email protected]>
Expand All @@ -65,14 +70,23 @@ Boris Brezillon <[email protected]> <[email protected]>
Boris Brezillon <[email protected]> <[email protected]>
Brian Avery <[email protected]>
Brian King <[email protected]>
Brian Silverman <[email protected]> <[email protected]>
Changbin Du <[email protected]> <[email protected]>
Changbin Du <[email protected]> <[email protected]>
Chao Yu <[email protected]> <[email protected]>
Chao Yu <[email protected]> <[email protected]>
Chris Chiu <[email protected]> <[email protected]>
Chris Chiu <[email protected]> <[email protected]>
Christian Borntraeger <[email protected]> <[email protected]>
Christian Borntraeger <[email protected]> <[email protected]>
Christian Borntraeger <[email protected]> <[email protected]>
Christian Brauner <[email protected]> <[email protected]>
Christian Brauner <[email protected]> <[email protected]>
Christian Brauner <[email protected]> <[email protected]>
Christophe Ricard <[email protected]>
Christoph Hellwig <[email protected]>
Colin Ian King <[email protected]> <[email protected]>
Colin Ian King <[email protected]> <[email protected]>
Corey Minyard <[email protected]>
Damian Hobson-Garcia <[email protected]>
Daniel Borkmann <[email protected]> <[email protected]>
Expand Down Expand Up @@ -100,6 +114,7 @@ Douglas Gilbert <[email protected]>
Ed L. Cashin <[email protected]>
Erik Kaneda <[email protected]> <[email protected]>
Evgeniy Polyakov <[email protected]>
Ezequiel Garcia <[email protected]> <[email protected]>
Felipe W Damasio <[email protected]>
Felix Kuhling <[email protected]>
Felix Moeller <[email protected]>
Expand All @@ -120,6 +135,8 @@ Greg Kroah-Hartman <[email protected]>
Greg Kroah-Hartman <[email protected]>
Greg Kurz <[email protected]> <[email protected]>
Gregory CLEMENT <[email protected]> <[email protected]>
Guo Ren <[email protected]> <[email protected]>
Guo Ren <[email protected]> <[email protected]>
Gustavo Padovan <[email protected]>
Gustavo Padovan <[email protected]>
Hanjun Guo <[email protected]> <[email protected]>
Expand Down Expand Up @@ -164,6 +181,7 @@ Jeff Layton <[email protected]> <[email protected]>
Jens Axboe <[email protected]>
Jens Osterkamp <[email protected]>
Jernej Skrabec <[email protected]> <[email protected]>
Jessica Zhang <[email protected]> <[email protected]>
Jiri Slaby <[email protected]> <[email protected]>
Jiri Slaby <[email protected]> <[email protected]>
Jiri Slaby <[email protected]> <[email protected]>
Expand All @@ -183,6 +201,7 @@ Juha Yrjola <at solidboot.com>
Juha Yrjola <[email protected]>
Juha Yrjola <[email protected]>
Julien Thierry <[email protected]> <[email protected]>
Kalyan Thota <[email protected]> <[email protected]>
Kay Sievers <[email protected]>
Kees Cook <[email protected]> <[email protected]>
Kees Cook <[email protected]> <[email protected]>
Expand All @@ -194,9 +213,11 @@ Kenneth W Chen <[email protected]>
Konstantin Khlebnikov <[email protected]> <[email protected]>
Konstantin Khlebnikov <[email protected]> <[email protected]>
Koushik <[email protected]>
Krishna Manikandan <[email protected]> <[email protected]>
Krzysztof Kozlowski <[email protected]> <[email protected]>
Krzysztof Kozlowski <[email protected]> <[email protected]>
Kuninori Morimoto <[email protected]>
Kuogee Hsieh <[email protected]> <[email protected]>
Leonardo Bras <[email protected]> <[email protected]>
Leonid I Ananiev <[email protected]>
Leon Romanovsky <[email protected]> <[email protected]>
Expand Down Expand Up @@ -278,6 +299,7 @@ Nicolas Pitre <[email protected]> <[email protected]>
Nicolas Pitre <[email protected]> <[email protected]>
Nicolas Saenz Julienne <[email protected]> <[email protected]>
Nicolas Saenz Julienne <[email protected]> <[email protected]>
Niklas Söderlund <[email protected]>
Oleksij Rempel <[email protected]> <[email protected]>
Oleksij Rempel <[email protected]> <[email protected]>
Oleksij Rempel <[email protected]> <[email protected]>
Expand All @@ -302,6 +324,7 @@ Qais Yousef <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Perret <[email protected]> <[email protected]>
Rafael J. Wysocki <[email protected]> <[email protected]>
Rajeev Nandan <[email protected]> <[email protected]>
Rajesh Shah <[email protected]>
Ralf Baechle <[email protected]>
Ralf Wildenhues <[email protected]>
Expand All @@ -316,6 +339,7 @@ Rui Saraiva <[email protected]>
Sachin P Sant <[email protected]>
Sakari Ailus <[email protected]> <[email protected]>
Sam Ravnborg <[email protected]>
Sankeerth Billakanti <[email protected]> <[email protected]>
Santosh Shilimkar <[email protected]>
Santosh Shilimkar <[email protected]>
Sarangdhar Joshi <[email protected]>
Expand Down
5 changes: 5 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,11 @@ S: Via Delle Palme, 9
S: Terni 05100
S: Italy

N: Ohad Ben Cohen
E: [email protected]
D: Remote Processor (remoteproc) subsystem
D: Remote Processor Messaging (rpmsg) subsystem

N: Krzysztof Benedyczak
E: [email protected]
W: http://www.mat.uni.torun.pl/~golbi
Expand Down
11 changes: 11 additions & 0 deletions Documentation/ABI/obsolete/o2cb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
What: /sys/o2cb
Date: Dec 2005
KernelVersion: 2.6.16
Contact: [email protected]
Description: Ocfs2-tools looks at 'interface-revision' for versioning
information. Each logmask/ file controls a set of debug prints
and can be written into with the strings "allow", "deny", or
"off". Reading the file returns the current state.
Was renamed to /sys/fs/u2cb/
Users: ocfs2-tools. It's sufficient to mail proposed changes to
[email protected].
4 changes: 4 additions & 0 deletions Documentation/ABI/obsolete/sysfs-bus-iio
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Description:

Since Kernel 5.11, multiple buffers are supported.
so, it is better to use, instead:

/sys/bus/iio/devices/iio:deviceX/bufferY/length

What: /sys/bus/iio/devices/iio:deviceX/buffer/enable
Expand All @@ -17,6 +18,7 @@ Description:

Since Kernel 5.11, multiple buffers are supported.
so, it is better to use, instead:

/sys/bus/iio/devices/iio:deviceX/bufferY/enable

What: /sys/bus/iio/devices/iio:deviceX/scan_elements
Expand Down Expand Up @@ -165,6 +167,7 @@ Description:

Since Kernel 5.11, multiple buffers are supported.
so, it is better to use, instead:

/sys/bus/iio/devices/iio:deviceX/bufferY/watermark

What: /sys/bus/iio/devices/iio:deviceX/buffer/data_available
Expand All @@ -179,4 +182,5 @@ Description:

Since Kernel 5.11, multiple buffers are supported.
so, it is better to use, instead:

/sys/bus/iio/devices/iio:deviceX/bufferY/data_available
22 changes: 0 additions & 22 deletions Documentation/ABI/obsolete/sysfs-class-dax

This file was deleted.

2 changes: 1 addition & 1 deletion Documentation/ABI/stable/o2cb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
What: /sys/fs/o2cb/ (was /sys/o2cb)
What: /sys/fs/o2cb/
Date: Dec 2005
KernelVersion: 2.6.16
Contact: [email protected]
Expand Down
Loading

0 comments on commit 1136fa0

Please sign in to comment.