Skip to content

Commit aa46732

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.8/klp-module-fixups' into for-next
2 parents d28b4c1 + e6eff43 commit aa46732

23,545 files changed

Lines changed: 1630029 additions & 753951 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: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ ForEachMacros:
8686
- 'bio_for_each_segment_all'
8787
- 'bio_list_for_each'
8888
- 'bip_for_each_vec'
89+
- 'bitmap_for_each_clear_region'
90+
- 'bitmap_for_each_set_region'
8991
- 'blkg_for_each_descendant_post'
9092
- 'blkg_for_each_descendant_pre'
9193
- 'blk_queue_for_each_rl'
@@ -115,6 +117,7 @@ ForEachMacros:
115117
- 'drm_client_for_each_connector_iter'
116118
- 'drm_client_for_each_modeset'
117119
- 'drm_connector_for_each_possible_encoder'
120+
- 'drm_for_each_bridge_in_chain'
118121
- 'drm_for_each_connector_iter'
119122
- 'drm_for_each_crtc'
120123
- 'drm_for_each_encoder'
@@ -136,12 +139,16 @@ ForEachMacros:
136139
- 'for_each_bio'
137140
- 'for_each_board_func_rsrc'
138141
- 'for_each_bvec'
142+
- 'for_each_card_auxs'
143+
- 'for_each_card_auxs_safe'
139144
- 'for_each_card_components'
140-
- 'for_each_card_links'
141-
- 'for_each_card_links_safe'
145+
- 'for_each_card_dapms'
146+
- 'for_each_card_pre_auxs'
142147
- 'for_each_card_prelinks'
143148
- 'for_each_card_rtds'
144149
- 'for_each_card_rtds_safe'
150+
- 'for_each_card_widgets'
151+
- 'for_each_card_widgets_safe'
145152
- 'for_each_cgroup_storage_type'
146153
- 'for_each_child_of_node'
147154
- 'for_each_clear_bit'
@@ -156,6 +163,7 @@ ForEachMacros:
156163
- 'for_each_cpu_and'
157164
- 'for_each_cpu_not'
158165
- 'for_each_cpu_wrap'
166+
- 'for_each_dapm_widgets'
159167
- 'for_each_dev_addr'
160168
- 'for_each_dev_scope'
161169
- 'for_each_displayid_db'
@@ -186,10 +194,12 @@ ForEachMacros:
186194
- 'for_each_ip_tunnel_rcu'
187195
- 'for_each_irq_nr'
188196
- 'for_each_link_codecs'
197+
- 'for_each_link_cpus'
189198
- 'for_each_link_platforms'
190199
- 'for_each_lru'
191200
- 'for_each_matching_node'
192201
- 'for_each_matching_node_and_match'
202+
- 'for_each_member'
193203
- 'for_each_memblock'
194204
- 'for_each_memblock_type'
195205
- 'for_each_memcg_cache_index'
@@ -200,9 +210,11 @@ ForEachMacros:
200210
- 'for_each_msi_entry'
201211
- 'for_each_msi_entry_safe'
202212
- 'for_each_net'
213+
- 'for_each_net_continue_reverse'
203214
- 'for_each_netdev'
204215
- 'for_each_netdev_continue'
205216
- 'for_each_netdev_continue_rcu'
217+
- 'for_each_netdev_continue_reverse'
206218
- 'for_each_netdev_feature'
207219
- 'for_each_netdev_in_bond_rcu'
208220
- 'for_each_netdev_rcu'
@@ -242,6 +254,7 @@ ForEachMacros:
242254
- 'for_each_pci_bridge'
243255
- 'for_each_pci_dev'
244256
- 'for_each_pci_msi_entry'
257+
- 'for_each_pcm_streams'
245258
- 'for_each_populated_zone'
246259
- 'for_each_possible_cpu'
247260
- 'for_each_present_cpu'
@@ -252,12 +265,15 @@ ForEachMacros:
252265
- 'for_each_property_of_node'
253266
- 'for_each_registered_fb'
254267
- 'for_each_reserved_mem_region'
255-
- 'for_each_rtd_codec_dai'
256-
- 'for_each_rtd_codec_dai_rollback'
257-
- 'for_each_rtdcom'
258-
- 'for_each_rtdcom_safe'
268+
- 'for_each_rtd_codec_dais'
269+
- 'for_each_rtd_codec_dais_rollback'
270+
- 'for_each_rtd_components'
271+
- 'for_each_rtd_cpu_dais'
272+
- 'for_each_rtd_cpu_dais_rollback'
273+
- 'for_each_rtd_dais'
259274
- 'for_each_set_bit'
260275
- 'for_each_set_bit_from'
276+
- 'for_each_set_clump8'
261277
- 'for_each_sg'
262278
- 'for_each_sg_dma_page'
263279
- 'for_each_sg_page'
@@ -267,6 +283,7 @@ ForEachMacros:
267283
- 'for_each_subelement_id'
268284
- '__for_each_thread'
269285
- 'for_each_thread'
286+
- 'for_each_wakeup_source'
270287
- 'for_each_zone'
271288
- 'for_each_zone_zonelist'
272289
- 'for_each_zone_zonelist_nodemask'
@@ -325,11 +342,13 @@ ForEachMacros:
325342
- 'klp_for_each_object'
326343
- 'klp_for_each_object_safe'
327344
- 'klp_for_each_object_static'
345+
- 'kunit_suite_for_each_test_case'
328346
- 'kvm_for_each_memslot'
329347
- 'kvm_for_each_vcpu'
330348
- 'list_for_each'
331349
- 'list_for_each_codec'
332350
- 'list_for_each_codec_safe'
351+
- 'list_for_each_continue'
333352
- 'list_for_each_entry'
334353
- 'list_for_each_entry_continue'
335354
- 'list_for_each_entry_continue_rcu'
@@ -351,6 +370,7 @@ ForEachMacros:
351370
- 'llist_for_each_entry'
352371
- 'llist_for_each_entry_safe'
353372
- 'llist_for_each_safe'
373+
- 'mci_for_each_dimm'
354374
- 'media_device_for_each_entity'
355375
- 'media_device_for_each_intf'
356376
- 'media_device_for_each_link'
@@ -376,6 +396,7 @@ ForEachMacros:
376396
- 'of_property_for_each_string'
377397
- 'of_property_for_each_u32'
378398
- 'pci_bus_for_each_resource'
399+
- 'pcm_for_each_format'
379400
- 'ping_portaddr_for_each_entry'
380401
- 'plist_for_each'
381402
- 'plist_for_each_continue'
@@ -444,10 +465,16 @@ ForEachMacros:
444465
- 'virtio_device_for_each_vq'
445466
- 'xa_for_each'
446467
- 'xa_for_each_marked'
468+
- 'xa_for_each_range'
447469
- 'xa_for_each_start'
448470
- 'xas_for_each'
449471
- 'xas_for_each_conflict'
450472
- 'xas_for_each_marked'
473+
- 'xbc_array_for_each_value'
474+
- 'xbc_for_each_key_value'
475+
- 'xbc_node_for_each_array_value'
476+
- 'xbc_node_for_each_child'
477+
- 'xbc_node_for_each_key_value'
451478
- 'zorro_for_each_dev'
452479

453480
#IncludeBlocks: Preserve # Unknown to clang-format-5.0
@@ -465,7 +492,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
465492
MacroBlockBegin: ''
466493
MacroBlockEnd: ''
467494
MaxEmptyLinesToKeep: 1
468-
NamespaceIndentation: Inner
495+
NamespaceIndentation: None
469496
#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
470497
ObjCBlockIndentWidth: 8
471498
ObjCSpaceAfterProperty: true

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.c diff=cpp
22
*.h diff=cpp
3+
*.dtsi diff=dts
4+
*.dts diff=dts

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
#
23
# NOTE! Don't add files that are generated in specific
34
# subdirectories here. Add them in the ".gitignore" file
@@ -32,7 +33,6 @@
3233
*.lzo
3334
*.mod
3435
*.mod.c
35-
*.ns_deps
3636
*.o
3737
*.o.*
3838
*.patch
@@ -61,6 +61,7 @@ modules.order
6161
/System.map
6262
/Module.markers
6363
/modules.builtin.modinfo
64+
/modules.nsdeps
6465

6566
#
6667
# RPM spec file (make rpm-pkg)

.mailmap

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
1818
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
1919
Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
2020
Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
21+
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
2122
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
2223
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
2324
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
@@ -27,11 +28,14 @@ Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
2728
Andreas Herrmann <aherrman@de.ibm.com>
2829
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
2930
Andrew Morton <akpm@linux-foundation.org>
31+
Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
32+
Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>
3033
Andrew Vasquez <andrew.vasquez@qlogic.com>
3134
Andy Adamson <andros@citi.umich.edu>
3235
Antoine Tenart <antoine.tenart@free-electrons.com>
3336
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
3437
Archit Taneja <archit@ti.com>
38+
Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
3539
Arnaud Patard <arnaud.patard@rtp-net.org>
3640
Arnd Bergmann <arnd@arndb.de>
3741
Axel Dyks <xl@xlsigned.net>
@@ -73,6 +77,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
7377
Domen Puncer <domen@coderock.org>
7478
Douglas Gilbert <dougg@torque.net>
7579
Ed L. Cashin <ecashin@coraid.com>
80+
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
7681
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
7782
Felipe W Damasio <felipewd@terra.com.br>
7883
Felix Kuhling <fxkuehl@gmx.de>
@@ -98,12 +103,16 @@ Jacob Shin <Jacob.Shin@amd.com>
98103
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
99104
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
100105
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
106+
Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
101107
James Bottomley <jejb@mulgrave.(none)>
102108
James Bottomley <jejb@titanic.il.steeleye.com>
103109
James E Wilson <wilson@specifix.com>
104110
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
105111
James Hogan <jhogan@kernel.org> <james@albanarts.com>
106112
James Ketrenos <jketreno@io.(none)>
113+
Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
114+
Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
115+
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
107116
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
108117
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
109118
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
@@ -133,6 +142,7 @@ Juha Yrjola <at solidboot.com>
133142
Juha Yrjola <juha.yrjola@nokia.com>
134143
Juha Yrjola <juha.yrjola@solidboot.com>
135144
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
145+
Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>
136146
Kay Sievers <kay.sievers@vrfy.org>
137147
Kenneth W Chen <kenneth.w.chen@intel.com>
138148
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
@@ -148,13 +158,15 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
148158
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
149159
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
150160
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
161+
Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
151162
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
152163
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
153164
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
154165
Mark Brown <broonie@sirena.org.uk>
155166
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
156167
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
157168
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
169+
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
158170
Mathieu Othacehe <m.othacehe@gmail.com>
159171
Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
160172
Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
@@ -198,18 +210,25 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
198210
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
199211
Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
200212
Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
213+
Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
201214
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
202215
Patrick Mochel <mochel@digitalimplant.org>
203216
Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
204217
Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
218+
Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.ibm.com>
219+
Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.vnet.ibm.com>
220+
Paul E. McKenney <paulmck@kernel.org> <paul.mckenney@linaro.org>
221+
Paul E. McKenney <paulmck@kernel.org> <paulmck@us.ibm.com>
205222
Peter A Jonsson <pj@ludd.ltu.se>
206223
Peter Oruba <peter@oruba.de>
207224
Peter Oruba <peter.oruba@amd.com>
208225
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
209226
Praveen BP <praveenbp@ti.com>
210227
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
211228
Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
229+
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
212230
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
231+
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
213232
Rajesh Shah <rajesh.shah@intel.com>
214233
Ralf Baechle <ralf@linux-mips.org>
215234
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -226,9 +245,11 @@ Santosh Shilimkar <ssantosh@kernel.org>
226245
Santosh Shilimkar <santosh.shilimkar@oracle.org>
227246
Sascha Hauer <s.hauer@pengutronix.de>
228247
S.Çağlar Onur <caglar@pardus.org.tr>
248+
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
229249
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
230250
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
231251
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
252+
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
232253
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
233254
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
234255
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
@@ -245,6 +266,7 @@ Sumit Semwal <sumit.semwal@ti.com>
245266
Tejun Heo <htejun@gmail.com>
246267
Thomas Graf <tgraf@suug.ch>
247268
Thomas Pedersen <twp@codeaurora.org>
269+
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
248270
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
249271
Tony Luck <tony.luck@intel.com>
250272
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
@@ -260,6 +282,7 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
260282
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
261283
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
262284
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
285+
Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
263286
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
264287
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
265288
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
@@ -271,3 +294,5 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br>
271294
Gustavo Padovan <padovan@profusion.mobi>
272295
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
273296
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
297+
Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
298+
Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>

COPYING

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ In addition, other licenses may also apply. Please see:
1616
Documentation/process/license-rules.rst
1717

1818
for more details.
19+
20+
All contributions to the Linux Kernel are subject to this COPYING file.

CREDITS

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,11 @@ D: Original author of Amiga FFS filesystem
567567
S: Orlando, Florida
568568
S: USA
569569

570+
N: Paul Burton
571+
E: paulburton@kernel.org
572+
W: https://pburton.com
573+
D: MIPS maintainer 2018-2020
574+
570575
N: Lennert Buytenhek
571576
E: kernel@wantstofly.org
572577
D: Original (2.4) rewrite of the ethernet bridging code
@@ -1875,8 +1880,9 @@ S: The Netherlands
18751880

18761881
N: Martin Kepplinger
18771882
E: martink@posteo.de
1878-
E: martin.kepplinger@ginzinger.com
1883+
E: martin.kepplinger@puri.sm
18791884
W: http://www.martinkepplinger.com
1885+
P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468 6E3F 5003 98DF 5AB3 87D3
18801886
D: mma8452 accelerators iio driver
18811887
D: pegasus_notetaker input driver
18821888
D: Kernel fixes and cleanups
@@ -3301,7 +3307,9 @@ S: France
33013307
N: Aleksa Sarai
33023308
E: cyphar@cyphar.com
33033309
W: https://www.cyphar.com/
3304-
D: `pids` cgroup subsystem
3310+
D: /sys/fs/cgroup/pids
3311+
D: openat2(2)
3312+
S: Sydney, Australia
33053313

33063314
N: Dipankar Sarma
33073315
E: dipankar@in.ibm.com

Documentation/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
output
23
*.pyc
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/enabled.
2+
3+
What: /sys/kernel/fadump_enabled
4+
Date: Feb 2012
5+
Contact: linuxppc-dev@lists.ozlabs.org
6+
Description: read only
7+
Primarily used to identify whether the FADump is enabled in
8+
the kernel or not.
9+
User: Kdump service
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬
2+
3+
What: /sys/kernel/fadump_registered
4+
Date: Feb 2012
5+
Contact: linuxppc-dev@lists.ozlabs.org
6+
Description: read/write
7+
Helps to control the dump collect feature from userspace.
8+
Setting 1 to this file enables the system to collect the
9+
dump and 0 to disable it.
10+
User: Kdump service
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.¬
2+
3+
What: /sys/kernel/fadump_release_mem
4+
Date: Feb 2012
5+
Contact: linuxppc-dev@lists.ozlabs.org
6+
Description: write only
7+
This is a special sysfs file and only available when
8+
the system is booted to capture the vmcore using FADump.
9+
It is used to release the memory reserved by FADump to
10+
save the crash dump.

0 commit comments

Comments
 (0)