Skip to content

Commit d05e4c8

Browse files
joergroedeljoergroedel
committed
Merge branches 'iommu/fixes', 'arm/msm', 'arm/tegra', 'arm/mediatek', 'x86/vt-d', 'x86/amd', 'hyper-v' and 'core' into next
8 parents cffaaf0 + ba93c35 + 7072230 + a947a45 + 48739af + 5f226da + 32d5860 + 18b3af4 commit d05e4c8

File tree

2,002 files changed

+21840
-11614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,002 files changed

+21840
-11614
lines changed

‎.clang-format

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ ForEachMacros:
7272
- 'apei_estatus_for_each_section'
7373
- 'ata_for_each_dev'
7474
- 'ata_for_each_link'
75+
- '__ata_qc_for_each'
76+
- 'ata_qc_for_each'
77+
- 'ata_qc_for_each_raw'
78+
- 'ata_qc_for_each_with_internal'
7579
- 'ax25_for_each'
7680
- 'ax25_uid_for_each'
7781
- 'bio_for_each_integrity_vec'
@@ -85,6 +89,7 @@ ForEachMacros:
8589
- 'blk_queue_for_each_rl'
8690
- 'bond_for_each_slave'
8791
- 'bond_for_each_slave_rcu'
92+
- 'bpf_for_each_spilled_reg'
8893
- 'btree_for_each_safe128'
8994
- 'btree_for_each_safe32'
9095
- 'btree_for_each_safe64'
@@ -103,6 +108,8 @@ ForEachMacros:
103108
- 'drm_atomic_crtc_for_each_plane'
104109
- 'drm_atomic_crtc_state_for_each_plane'
105110
- 'drm_atomic_crtc_state_for_each_plane_state'
111+
- 'drm_atomic_for_each_plane_damage'
112+
- 'drm_connector_for_each_possible_encoder'
106113
- 'drm_for_each_connector_iter'
107114
- 'drm_for_each_crtc'
108115
- 'drm_for_each_encoder'
@@ -121,18 +128,32 @@ ForEachMacros:
121128
- 'for_each_bio'
122129
- 'for_each_board_func_rsrc'
123130
- 'for_each_bvec'
131+
- 'for_each_card_components'
132+
- 'for_each_card_links'
133+
- 'for_each_card_links_safe'
134+
- 'for_each_card_prelinks'
135+
- 'for_each_card_rtds'
136+
- 'for_each_card_rtds_safe'
137+
- 'for_each_cgroup_storage_type'
124138
- 'for_each_child_of_node'
125139
- 'for_each_clear_bit'
126140
- 'for_each_clear_bit_from'
127141
- 'for_each_cmsghdr'
128142
- 'for_each_compatible_node'
143+
- 'for_each_component_dais'
144+
- 'for_each_component_dais_safe'
145+
- 'for_each_comp_order'
129146
- 'for_each_console'
130147
- 'for_each_cpu'
131148
- 'for_each_cpu_and'
132149
- 'for_each_cpu_not'
133150
- 'for_each_cpu_wrap'
134151
- 'for_each_dev_addr'
135152
- 'for_each_dma_cap_mask'
153+
- 'for_each_dpcm_be'
154+
- 'for_each_dpcm_be_rollback'
155+
- 'for_each_dpcm_be_safe'
156+
- 'for_each_dpcm_fe'
136157
- 'for_each_drhd_unit'
137158
- 'for_each_dss_dev'
138159
- 'for_each_efi_memory_desc'
@@ -149,6 +170,7 @@ ForEachMacros:
149170
- 'for_each_iommu'
150171
- 'for_each_ip_tunnel_rcu'
151172
- 'for_each_irq_nr'
173+
- 'for_each_link_codecs'
152174
- 'for_each_lru'
153175
- 'for_each_matching_node'
154176
- 'for_each_matching_node_and_match'
@@ -160,6 +182,7 @@ ForEachMacros:
160182
- 'for_each_mem_range_rev'
161183
- 'for_each_migratetype_order'
162184
- 'for_each_msi_entry'
185+
- 'for_each_msi_entry_safe'
163186
- 'for_each_net'
164187
- 'for_each_netdev'
165188
- 'for_each_netdev_continue'
@@ -183,12 +206,14 @@ ForEachMacros:
183206
- 'for_each_node_with_property'
184207
- 'for_each_of_allnodes'
185208
- 'for_each_of_allnodes_from'
209+
- 'for_each_of_cpu_node'
186210
- 'for_each_of_pci_range'
187211
- 'for_each_old_connector_in_state'
188212
- 'for_each_old_crtc_in_state'
189213
- 'for_each_oldnew_connector_in_state'
190214
- 'for_each_oldnew_crtc_in_state'
191215
- 'for_each_oldnew_plane_in_state'
216+
- 'for_each_oldnew_plane_in_state_reverse'
192217
- 'for_each_oldnew_private_obj_in_state'
193218
- 'for_each_old_plane_in_state'
194219
- 'for_each_old_private_obj_in_state'
@@ -206,14 +231,17 @@ ForEachMacros:
206231
- 'for_each_process'
207232
- 'for_each_process_thread'
208233
- 'for_each_property_of_node'
234+
- 'for_each_registered_fb'
209235
- 'for_each_reserved_mem_region'
210-
- 'for_each_resv_unavail_range'
236+
- 'for_each_rtd_codec_dai'
237+
- 'for_each_rtd_codec_dai_rollback'
211238
- 'for_each_rtdcom'
212239
- 'for_each_rtdcom_safe'
213240
- 'for_each_set_bit'
214241
- 'for_each_set_bit_from'
215242
- 'for_each_sg'
216243
- 'for_each_sg_page'
244+
- 'for_each_sibling_event'
217245
- '__for_each_thread'
218246
- 'for_each_thread'
219247
- 'for_each_zone'
@@ -251,6 +279,8 @@ ForEachMacros:
251279
- 'hlist_nulls_for_each_entry_from'
252280
- 'hlist_nulls_for_each_entry_rcu'
253281
- 'hlist_nulls_for_each_entry_safe'
282+
- 'i3c_bus_for_each_i2cdev'
283+
- 'i3c_bus_for_each_i3cdev'
254284
- 'ide_host_for_each_port'
255285
- 'ide_port_for_each_dev'
256286
- 'ide_port_for_each_present_dev'
@@ -267,11 +297,14 @@ ForEachMacros:
267297
- 'kvm_for_each_memslot'
268298
- 'kvm_for_each_vcpu'
269299
- 'list_for_each'
300+
- 'list_for_each_codec'
301+
- 'list_for_each_codec_safe'
270302
- 'list_for_each_entry'
271303
- 'list_for_each_entry_continue'
272304
- 'list_for_each_entry_continue_rcu'
273305
- 'list_for_each_entry_continue_reverse'
274306
- 'list_for_each_entry_from'
307+
- 'list_for_each_entry_from_rcu'
275308
- 'list_for_each_entry_from_reverse'
276309
- 'list_for_each_entry_lockless'
277310
- 'list_for_each_entry_rcu'
@@ -291,6 +324,7 @@ ForEachMacros:
291324
- 'media_device_for_each_intf'
292325
- 'media_device_for_each_link'
293326
- 'media_device_for_each_pad'
327+
- 'nanddev_io_for_each_page'
294328
- 'netdev_for_each_lower_dev'
295329
- 'netdev_for_each_lower_private'
296330
- 'netdev_for_each_lower_private_rcu'
@@ -357,12 +391,14 @@ ForEachMacros:
357391
- 'sk_nulls_for_each'
358392
- 'sk_nulls_for_each_from'
359393
- 'sk_nulls_for_each_rcu'
394+
- 'snd_array_for_each'
360395
- 'snd_pcm_group_for_each_entry'
361396
- 'snd_soc_dapm_widget_for_each_path'
362397
- 'snd_soc_dapm_widget_for_each_path_safe'
363398
- 'snd_soc_dapm_widget_for_each_sink_path'
364399
- 'snd_soc_dapm_widget_for_each_source_path'
365400
- 'tb_property_for_each'
401+
- 'tcf_exts_for_each_action'
366402
- 'udp_portaddr_for_each_entry'
367403
- 'udp_portaddr_for_each_entry_rcu'
368404
- 'usb_hub_for_each_child'
@@ -371,6 +407,11 @@ ForEachMacros:
371407
- 'v4l2_m2m_for_each_dst_buf_safe'
372408
- 'v4l2_m2m_for_each_src_buf'
373409
- 'v4l2_m2m_for_each_src_buf_safe'
410+
- 'virtio_device_for_each_vq'
411+
- 'xa_for_each'
412+
- 'xas_for_each'
413+
- 'xas_for_each_conflict'
414+
- 'xas_for_each_marked'
374415
- 'zorro_for_each_dev'
375416

376417
#IncludeBlocks: Preserve # Unknown to clang-format-5.0

‎CREDITS

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -842,10 +842,9 @@ D: ax25-utils maintainer.
842842

843843
N: Helge Deller
844844
E: deller@gmx.de
845-
E: hdeller@redhat.de
846-
D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver
847-
S: Schimmelsrain 1
848-
S: D-69231 Rauenberg
845+
W: http://www.parisc-linux.org/
846+
D: PA-RISC Linux architecture maintainer
847+
D: LASI-, ASP-, WAX-, LCD/LED-driver
849848
S: Germany
850849

851850
N: Jean Delvare
@@ -1361,7 +1360,7 @@ S: Stellenbosch, Western Cape
13611360
S: South Africa
13621361

13631362
N: Grant Grundler
1364-
E: grundler@parisc-linux.org
1363+
E: grantgrundler@gmail.com
13651364
W: http://obmouse.sourceforge.net/
13661365
W: http://www.parisc-linux.org/
13671366
D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
@@ -2492,7 +2491,7 @@ S: Syracuse, New York 13206
24922491
S: USA
24932492

24942493
N: Kyle McMartin
2495-
E: kyle@parisc-linux.org
2494+
E: kyle@mcmartin.ca
24962495
D: Linux/PARISC hacker
24972496
D: AD1889 sound driver
24982497
S: Ottawa, Canada
@@ -3780,14 +3779,13 @@ S: 21513 Conradia Ct
37803779
S: Cupertino, CA 95014
37813780
S: USA
37823781

3783-
N: Thibaut Varene
3784-
E: T-Bone@parisc-linux.org
3785-
W: http://www.parisc-linux.org/~varenet/
3786-
P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063
3782+
N: Thibaut Varène
3783+
E: hacks+kernel@slashdirt.org
3784+
W: http://hacks.slashdirt.org/
37873785
D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
37883786
D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
37893787
D: AD1889 sound driver
3790-
S: Paris, France
3788+
S: France
37913789

37923790
N: Heikki Vatiainen
37933791
E: hessu@cs.tut.fi

‎Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
2424
cpld3_version
2525

2626
Date: November 2018
27-
KernelVersion: 4.21
27+
KernelVersion: 5.0
2828
Contact: Vadim Pasternak <vadimpmellanox.com>
2929
Description: These files show with which CPLD versions have been burned
3030
on LED board.
@@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
3535
jtag_enable
3636

3737
Date: November 2018
38-
KernelVersion: 4.21
38+
KernelVersion: 5.0
3939
Contact: Vadim Pasternak <vadimpmellanox.com>
4040
Description: These files enable and disable the access to the JTAG domain.
4141
By default access to the JTAG domain is disabled.
@@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
105105
reset_voltmon_upgrade_fail
106106

107107
Date: November 2018
108-
KernelVersion: 4.21
108+
KernelVersion: 5.0
109109
Contact: Vadim Pasternak <vadimpmellanox.com>
110110
Description: These files show the system reset cause, as following: ComEx
111111
power fail, reset from ComEx, system platform reset, reset

‎Documentation/ABI/testing/sysfs-block

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,3 +279,12 @@ Description:
279279
size in 512B sectors of the zones of the device, with
280280
the eventual exception of the last zone of the device
281281
which may be smaller.
282+
283+
What: /sys/block/<disk>/queue/io_timeout
284+
Date: November 2018
285+
Contact: Weiping Zhang <zhangweiping@didiglobal.com>
286+
Description:
287+
io_timeout is the request timeout in milliseconds. If a request
288+
does not complete in this time then the block driver timeout
289+
handler is invoked. That timeout handler can decide to retry
290+
the request, to fail it or to start a device recovery strategy.

‎Documentation/ABI/testing/sysfs-block-zram

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,18 @@ Description:
122122
statistics (bd_count, bd_reads, bd_writes) in a format
123123
similar to block layer statistics file format.
124124

125+
What: /sys/block/zram<id>/writeback_limit_enable
126+
Date: November 2018
127+
Contact: Minchan Kim <minchan@kernel.org>
128+
Description:
129+
The writeback_limit_enable file is read-write and specifies
130+
eanbe of writeback_limit feature. "1" means eable the feature.
131+
No limit "0" is the initial state.
132+
125133
What: /sys/block/zram<id>/writeback_limit
126134
Date: November 2018
127135
Contact: Minchan Kim <minchan@kernel.org>
128136
Description:
129137
The writeback_limit file is read-write and specifies the maximum
130138
amount of writeback ZRAM can do. The limit could be changed
131-
in run time and "0" means disable the limit.
132-
No limit is the initial state.
139+
in run time.

‎Documentation/admin-guide/README.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.. _readme:
22

3-
Linux kernel release 4.x <http://kernel.org/>
3+
Linux kernel release 5.x <http://kernel.org/>
44
=============================================
55

6-
These are the release notes for Linux version 4. Read them carefully,
6+
These are the release notes for Linux version 5. Read them carefully,
77
as they tell you what this is all about, explain how to install the
88
kernel, and what to do if something goes wrong.
99

@@ -63,7 +63,7 @@ Installing the kernel source
6363
directory where you have permissions (e.g. your home directory) and
6464
unpack it::
6565

66-
xz -cd linux-4.X.tar.xz | tar xvf -
66+
xz -cd linux-5.x.tar.xz | tar xvf -
6767

6868
Replace "X" with the version number of the latest kernel.
6969

@@ -72,26 +72,26 @@ Installing the kernel source
7272
files. They should match the library, and not get messed up by
7373
whatever the kernel-du-jour happens to be.
7474

75-
- You can also upgrade between 4.x releases by patching. Patches are
75+
- You can also upgrade between 5.x releases by patching. Patches are
7676
distributed in the xz format. To install by patching, get all the
7777
newer patch files, enter the top level directory of the kernel source
78-
(linux-4.X) and execute::
78+
(linux-5.x) and execute::
7979

80-
xz -cd ../patch-4.x.xz | patch -p1
80+
xz -cd ../patch-5.x.xz | patch -p1
8181

82-
Replace "x" for all versions bigger than the version "X" of your current
82+
Replace "x" for all versions bigger than the version "x" of your current
8383
source tree, **in_order**, and you should be ok. You may want to remove
8484
the backup files (some-file-name~ or some-file-name.orig), and make sure
8585
that there are no failed patches (some-file-name# or some-file-name.rej).
8686
If there are, either you or I have made a mistake.
8787

88-
Unlike patches for the 4.x kernels, patches for the 4.x.y kernels
88+
Unlike patches for the 5.x kernels, patches for the 5.x.y kernels
8989
(also known as the -stable kernels) are not incremental but instead apply
90-
directly to the base 4.x kernel. For example, if your base kernel is 4.0
91-
and you want to apply the 4.0.3 patch, you must not first apply the 4.0.1
92-
and 4.0.2 patches. Similarly, if you are running kernel version 4.0.2 and
93-
want to jump to 4.0.3, you must first reverse the 4.0.2 patch (that is,
94-
patch -R) **before** applying the 4.0.3 patch. You can read more on this in
90+
directly to the base 5.x kernel. For example, if your base kernel is 5.0
91+
and you want to apply the 5.0.3 patch, you must not first apply the 5.0.1
92+
and 5.0.2 patches. Similarly, if you are running kernel version 5.0.2 and
93+
want to jump to 5.0.3, you must first reverse the 5.0.2 patch (that is,
94+
patch -R) **before** applying the 5.0.3 patch. You can read more on this in
9595
:ref:`Documentation/process/applying-patches.rst <applying_patches>`.
9696

9797
Alternatively, the script patch-kernel can be used to automate this
@@ -114,7 +114,7 @@ Installing the kernel source
114114
Software requirements
115115
---------------------
116116

117-
Compiling and running the 4.x kernels requires up-to-date
117+
Compiling and running the 5.x kernels requires up-to-date
118118
versions of various software packages. Consult
119119
:ref:`Documentation/process/changes.rst <changes>` for the minimum version numbers
120120
required and how to get updates for these packages. Beware that using
@@ -132,12 +132,12 @@ Build directory for the kernel
132132
place for the output files (including .config).
133133
Example::
134134

135-
kernel source code: /usr/src/linux-4.X
135+
kernel source code: /usr/src/linux-5.x
136136
build directory: /home/name/build/kernel
137137

138138
To configure and build the kernel, use::
139139

140-
cd /usr/src/linux-4.X
140+
cd /usr/src/linux-5.x
141141
make O=/home/name/build/kernel menuconfig
142142
make O=/home/name/build/kernel
143143
sudo make O=/home/name/build/kernel modules_install install

‎Documentation/block/bfq-iosched.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,13 @@ video playing/streaming, a very low drop rate may be more important
357357
than maximum throughput. In these cases, consider setting the
358358
strict_guarantees parameter.
359359

360+
slice_idle_us
361+
-------------
362+
363+
Controls the same tuning parameter as slice_idle, but in microseconds.
364+
Either tunable can be used to set idling behavior. Afterwards, the
365+
other tunable will reflect the newly set value in sysfs.
366+
360367
strict_guarantees
361368
-----------------
362369

‎Documentation/block/null_blk.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ shared_tags=[0/1]: Default: 0
8888

8989
zoned=[0/1]: Default: 0
9090
0: Block device is exposed as a random-access block device.
91-
1: Block device is exposed as a host-managed zoned block device.
91+
1: Block device is exposed as a host-managed zoned block device. Requires
92+
CONFIG_BLK_DEV_ZONED.
9293

9394
zone_size=[MB]: Default: 256
9495
Per zone size when exposed as a zoned block device. Must be a power of two.

0 commit comments

Comments
 (0)