Skip to content

Commit

Permalink
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
Browse files Browse the repository at this point in the history
First backmerge into drm-misc-next. Required for more helpers backmerged,
and to pull in 5.17 (rc2).

Signed-off-by: Maarten Lankhorst <[email protected]>
  • Loading branch information
mlankhorst committed Feb 7, 2022
2 parents ccbeca4 + 53dbee4 commit 542898c
Show file tree
Hide file tree
Showing 10,430 changed files with 458,358 additions and 225,713 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
12 changes: 12 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,6 +70,7 @@ 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]>
Expand Down Expand Up @@ -172,6 +178,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 @@ -191,6 +198,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 @@ -202,9 +210,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 @@ -311,6 +321,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 @@ -325,6 +336,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
22 changes: 0 additions & 22 deletions Documentation/ABI/obsolete/sysfs-class-dax

This file was deleted.

Loading

0 comments on commit 542898c

Please sign in to comment.