Skip to content

Commit 0a25540

Browse files
authored
Merge pull request #473 from libos-nuse/merge-5.3
Merge 5.3
2 parents 1be6745 + 704003c commit 0a25540

13,712 files changed

Lines changed: 1044312 additions & 455143 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: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,13 @@ ForEachMacros:
107107
- 'css_for_each_descendant_post'
108108
- 'css_for_each_descendant_pre'
109109
- 'device_for_each_child_node'
110+
- 'dma_fence_chain_for_each'
110111
- 'drm_atomic_crtc_for_each_plane'
111112
- 'drm_atomic_crtc_state_for_each_plane'
112113
- 'drm_atomic_crtc_state_for_each_plane_state'
113114
- 'drm_atomic_for_each_plane_damage'
115+
- 'drm_client_for_each_connector_iter'
116+
- 'drm_client_for_each_modeset'
114117
- 'drm_connector_for_each_possible_encoder'
115118
- 'drm_for_each_connector_iter'
116119
- 'drm_for_each_crtc'
@@ -126,6 +129,7 @@ ForEachMacros:
126129
- 'drm_mm_for_each_node_in_range'
127130
- 'drm_mm_for_each_node_safe'
128131
- 'flow_action_for_each'
132+
- 'for_each_active_dev_scope'
129133
- 'for_each_active_drhd_unit'
130134
- 'for_each_active_iommu'
131135
- 'for_each_available_child_of_node'
@@ -153,6 +157,8 @@ ForEachMacros:
153157
- 'for_each_cpu_not'
154158
- 'for_each_cpu_wrap'
155159
- 'for_each_dev_addr'
160+
- 'for_each_dev_scope'
161+
- 'for_each_displayid_db'
156162
- 'for_each_dma_cap_mask'
157163
- 'for_each_dpcm_be'
158164
- 'for_each_dpcm_be_rollback'
@@ -169,6 +175,8 @@ ForEachMacros:
169175
- 'for_each_evictable_lru'
170176
- 'for_each_fib6_node_rt_rcu'
171177
- 'for_each_fib6_walker_rt'
178+
- 'for_each_free_mem_pfn_range_in_zone'
179+
- 'for_each_free_mem_pfn_range_in_zone_from'
172180
- 'for_each_free_mem_range'
173181
- 'for_each_free_mem_range_reverse'
174182
- 'for_each_func_rsrc'
@@ -178,6 +186,7 @@ ForEachMacros:
178186
- 'for_each_ip_tunnel_rcu'
179187
- 'for_each_irq_nr'
180188
- 'for_each_link_codecs'
189+
- 'for_each_link_platforms'
181190
- 'for_each_lru'
182191
- 'for_each_matching_node'
183192
- 'for_each_matching_node_and_match'
@@ -302,7 +311,10 @@ ForEachMacros:
302311
- 'ide_port_for_each_present_dev'
303312
- 'idr_for_each_entry'
304313
- 'idr_for_each_entry_continue'
314+
- 'idr_for_each_entry_continue_ul'
305315
- 'idr_for_each_entry_ul'
316+
- 'in_dev_for_each_ifa_rcu'
317+
- 'in_dev_for_each_ifa_rtnl'
306318
- 'inet_bind_bucket_for_each'
307319
- 'inet_lhash2_for_each_icsk_rcu'
308320
- 'key_for_each'
@@ -343,8 +355,6 @@ ForEachMacros:
343355
- 'media_device_for_each_intf'
344356
- 'media_device_for_each_link'
345357
- 'media_device_for_each_pad'
346-
- 'mp_bvec_for_each_page'
347-
- 'mp_bvec_for_each_segment'
348358
- 'nanddev_io_for_each_page'
349359
- 'netdev_for_each_lower_dev'
350360
- 'netdev_for_each_lower_private'
@@ -381,18 +391,19 @@ ForEachMacros:
381391
- 'radix_tree_for_each_slot'
382392
- 'radix_tree_for_each_tagged'
383393
- 'rbtree_postorder_for_each_entry_safe'
394+
- 'rdma_for_each_block'
384395
- 'rdma_for_each_port'
385396
- 'resource_list_for_each_entry'
386397
- 'resource_list_for_each_entry_safe'
387398
- 'rhl_for_each_entry_rcu'
388399
- 'rhl_for_each_rcu'
389400
- 'rht_for_each'
390-
- 'rht_for_each_from'
391401
- 'rht_for_each_entry'
392402
- 'rht_for_each_entry_from'
393403
- 'rht_for_each_entry_rcu'
394404
- 'rht_for_each_entry_rcu_from'
395405
- 'rht_for_each_entry_safe'
406+
- 'rht_for_each_from'
396407
- 'rht_for_each_rcu'
397408
- 'rht_for_each_rcu_from'
398409
- '__rq_for_each_bio'

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*.lz4
3131
*.lzma
3232
*.lzo
33+
*.mod
3334
*.mod.c
3435
*.o
3536
*.o.*
@@ -141,3 +142,6 @@ x509.genkey
141142

142143
# Kdevelop4
143144
*.kdev4
145+
146+
# Clang's compilation database file
147+
/compile_commands.json

.mailmap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
6464
Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>
6565
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
6666
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
67+
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
68+
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
69+
Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
6770
Domen Puncer <domen@coderock.org>
6871
Douglas Gilbert <dougg@torque.net>
6972
Ed L. Cashin <ecashin@coraid.com>
@@ -98,6 +101,7 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
98101
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
99102
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
100103
Jean Tourrilhes <jt@hpl.hp.com>
104+
<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
101105
Jeff Garzik <jgarzik@pretzel.yyz.us>
102106
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
103107
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
@@ -116,6 +120,7 @@ John Stultz <johnstul@us.ibm.com>
116120
Juha Yrjola <at solidboot.com>
117121
Juha Yrjola <juha.yrjola@nokia.com>
118122
Juha Yrjola <juha.yrjola@solidboot.com>
123+
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
119124
Kay Sievers <kay.sievers@vrfy.org>
120125
Kenneth W Chen <kenneth.w.chen@intel.com>
121126
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
@@ -132,6 +137,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
132137
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
133138
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
134139
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
140+
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
135141
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
136142
Mark Brown <broonie@sirena.org.uk>
137143
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
@@ -157,6 +163,8 @@ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.co
157163
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
158164
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
159165
Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
166+
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
167+
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
160168
Mayuresh Janorkar <mayur@ti.com>
161169
Michael Buesch <m@bues.ch>
162170
Michel Dänzer <michel@tungstengraphics.com>

CREDITS

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,7 +1770,6 @@ S: USA
17701770

17711771
N: Dave Jones
17721772
E: davej@codemonkey.org.uk
1773-
W: http://www.codemonkey.org.uk
17741773
D: Assorted VIA x86 support.
17751774
D: 2.5 AGPGART overhaul.
17761775
D: CPUFREQ maintenance.
@@ -1800,7 +1799,7 @@ S: 2300 Copenhagen S.
18001799
S: Denmark
18011800

18021801
N: Jozsef Kadlecsik
1803-
E: kadlec@blackhole.kfki.hu
1802+
E: kadlec@netfilter.org
18041803
P: 1024D/470DB964 4CB3 1A05 713E 9BF7 FAC5 5809 DD8C B7B1 470D B964
18051804
D: netfilter: TCP window tracking code
18061805
D: netfilter: raw table
@@ -3120,7 +3119,7 @@ S: France
31203119
N: Rik van Riel
31213120
E: riel@redhat.com
31223121
W: http://www.surriel.com/
3123-
D: Linux-MM site, Documentation/sysctl/*, swap/mm readaround
3122+
D: Linux-MM site, Documentation/admin-guide/sysctl/*, swap/mm readaround
31243123
D: kswapd fixes, random kernel hacker, rmap VM,
31253124
D: nl.linux.org administrator, minor scheduler additions
31263125
S: Red Hat Boston

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Description: It is possible to switch the cpi setting of the mouse with the
55
press of a button.
66
When read, this file returns the raw number of the actual cpi
77
setting reported by the mouse. This number has to be further
8-
processed to receive the real dpi value.
8+
processed to receive the real dpi value:
99

1010
VALUE DPI
1111
1 400

Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Description:
1111
Kernel code may export it for complete or partial access.
1212

1313
GPIOs are identified as they are inside the kernel, using integers in
14-
the range 0..INT_MAX. See Documentation/gpio for more information.
14+
the range 0..INT_MAX. See Documentation/admin-guide/gpio for more information.
1515

1616
/sys/class/gpio
1717
/export ... asks the kernel to export a GPIO to userspace

Documentation/ABI/removed/sysfs-class-rfkill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
rfkill - radio frequency (RF) connector kill switch support
22

3-
For details to this subsystem look at Documentation/rfkill.txt.
3+
For details to this subsystem look at Documentation/driver-api/rfkill.rst.
44

55
What: /sys/class/rfkill/rfkill[0-9]+/claim
66
Date: 09-Jul-2007

Documentation/ABI/stable/sysfs-class-infiniband

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -423,23 +423,6 @@ Description:
423423
(e.g. driver restart on the VM which owns the VF).
424424

425425

426-
sysfs interface for NetEffect RNIC Low-Level iWARP driver (nes)
427-
---------------------------------------------------------------
428-
429-
What: /sys/class/infiniband/nesX/hw_rev
430-
What: /sys/class/infiniband/nesX/hca_type
431-
What: /sys/class/infiniband/nesX/board_id
432-
Date: Feb, 2008
433-
KernelVersion: v2.6.25
434-
Contact: linux-rdma@vger.kernel.org
435-
Description:
436-
hw_rev: (RO) Hardware revision number
437-
438-
hca_type: (RO) Host Channel Adapter type (NEX020)
439-
440-
board_id: (RO) Manufacturing board id
441-
442-
443426
sysfs interface for Chelsio T4/T5 RDMA driver (cxgb4)
444427
-----------------------------------------------------
445428

Documentation/ABI/stable/sysfs-class-rfkill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
rfkill - radio frequency (RF) connector kill switch support
22

3-
For details to this subsystem look at Documentation/rfkill.txt.
3+
For details to this subsystem look at Documentation/driver-api/rfkill.rst.
44

55
For the deprecated /sys/class/rfkill/*/claim knobs of this interface look in
66
Documentation/ABI/removed/sysfs-class-rfkill.

Documentation/ABI/stable/sysfs-devices-node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Date: October 2002
6161
Contact: Linux Memory Management list <linux-mm@kvack.org>
6262
Description:
6363
The node's hit/miss statistics, in units of pages.
64-
See Documentation/numastat.txt
64+
See Documentation/admin-guide/numastat.rst
6565

6666
What: /sys/devices/system/node/nodeX/distance
6767
Date: October 2002

0 commit comments

Comments
 (0)