Skip to content

Commit d2e971d

Browse files
committed
Merge 5.6-rc7 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents e79220d + 16fbf79 commit d2e971d

File tree

413 files changed

+3481
-1486
lines changed

Some content is hidden

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

413 files changed

+3481
-1486
lines changed

.clang-format

Lines changed: 21 additions & 4 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,9 +139,10 @@ 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_pre_auxs'
142146
- 'for_each_card_prelinks'
143147
- 'for_each_card_rtds'
144148
- 'for_each_card_rtds_safe'
@@ -166,6 +170,7 @@ ForEachMacros:
166170
- 'for_each_dpcm_fe'
167171
- 'for_each_drhd_unit'
168172
- 'for_each_dss_dev'
173+
- 'for_each_efi_handle'
169174
- 'for_each_efi_memory_desc'
170175
- 'for_each_efi_memory_desc_in_map'
171176
- 'for_each_element'
@@ -190,6 +195,7 @@ ForEachMacros:
190195
- 'for_each_lru'
191196
- 'for_each_matching_node'
192197
- 'for_each_matching_node_and_match'
198+
- 'for_each_member'
193199
- 'for_each_memblock'
194200
- 'for_each_memblock_type'
195201
- 'for_each_memcg_cache_index'
@@ -200,9 +206,11 @@ ForEachMacros:
200206
- 'for_each_msi_entry'
201207
- 'for_each_msi_entry_safe'
202208
- 'for_each_net'
209+
- 'for_each_net_continue_reverse'
203210
- 'for_each_netdev'
204211
- 'for_each_netdev_continue'
205212
- 'for_each_netdev_continue_rcu'
213+
- 'for_each_netdev_continue_reverse'
206214
- 'for_each_netdev_feature'
207215
- 'for_each_netdev_in_bond_rcu'
208216
- 'for_each_netdev_rcu'
@@ -254,10 +262,10 @@ ForEachMacros:
254262
- 'for_each_reserved_mem_region'
255263
- 'for_each_rtd_codec_dai'
256264
- 'for_each_rtd_codec_dai_rollback'
257-
- 'for_each_rtdcom'
258-
- 'for_each_rtdcom_safe'
265+
- 'for_each_rtd_components'
259266
- 'for_each_set_bit'
260267
- 'for_each_set_bit_from'
268+
- 'for_each_set_clump8'
261269
- 'for_each_sg'
262270
- 'for_each_sg_dma_page'
263271
- 'for_each_sg_page'
@@ -267,6 +275,7 @@ ForEachMacros:
267275
- 'for_each_subelement_id'
268276
- '__for_each_thread'
269277
- 'for_each_thread'
278+
- 'for_each_wakeup_source'
270279
- 'for_each_zone'
271280
- 'for_each_zone_zonelist'
272281
- 'for_each_zone_zonelist_nodemask'
@@ -330,6 +339,7 @@ ForEachMacros:
330339
- 'list_for_each'
331340
- 'list_for_each_codec'
332341
- 'list_for_each_codec_safe'
342+
- 'list_for_each_continue'
333343
- 'list_for_each_entry'
334344
- 'list_for_each_entry_continue'
335345
- 'list_for_each_entry_continue_rcu'
@@ -351,6 +361,7 @@ ForEachMacros:
351361
- 'llist_for_each_entry'
352362
- 'llist_for_each_entry_safe'
353363
- 'llist_for_each_safe'
364+
- 'mci_for_each_dimm'
354365
- 'media_device_for_each_entity'
355366
- 'media_device_for_each_intf'
356367
- 'media_device_for_each_link'
@@ -444,10 +455,16 @@ ForEachMacros:
444455
- 'virtio_device_for_each_vq'
445456
- 'xa_for_each'
446457
- 'xa_for_each_marked'
458+
- 'xa_for_each_range'
447459
- 'xa_for_each_start'
448460
- 'xas_for_each'
449461
- 'xas_for_each_conflict'
450462
- 'xas_for_each_marked'
463+
- 'xbc_array_for_each_value'
464+
- 'xbc_for_each_key_value'
465+
- 'xbc_node_for_each_array_value'
466+
- 'xbc_node_for_each_child'
467+
- 'xbc_node_for_each_key_value'
451468
- 'zorro_for_each_dev'
452469

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

Documentation/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ stable kernels.
110110
+----------------+-----------------+-----------------+-----------------------------+
111111
| Cavium | ThunderX GICv3 | #23154 | CAVIUM_ERRATUM_23154 |
112112
+----------------+-----------------+-----------------+-----------------------------+
113+
| Cavium | ThunderX GICv3 | #38539 | N/A |
114+
+----------------+-----------------+-----------------+-----------------------------+
113115
| Cavium | ThunderX Core | #27456 | CAVIUM_ERRATUM_27456 |
114116
+----------------+-----------------+-----------------+-----------------------------+
115117
| Cavium | ThunderX Core | #30115 | CAVIUM_ERRATUM_30115 |

Documentation/devicetree/bindings/net/fsl-fman.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,13 @@ PROPERTIES
110110
Usage: required
111111
Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt
112112

113+
- fsl,erratum-a050385
114+
Usage: optional
115+
Value type: boolean
116+
Definition: A boolean property. Indicates the presence of the
117+
erratum A050385 which indicates that DMA transactions that are
118+
split can result in a FMan lock.
119+
113120
=============================================================================
114121
FMan MURAM Node
115122

Documentation/filesystems/porting.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,3 +850,11 @@ business doing so.
850850
d_alloc_pseudo() is internal-only; uses outside of alloc_file_pseudo() are
851851
very suspect (and won't work in modules). Such uses are very likely to
852852
be misspelled d_alloc_anon().
853+
854+
---
855+
856+
**mandatory**
857+
858+
[should've been added in 2016] stale comment in finish_open() nonwithstanding,
859+
failure exits in ->atomic_open() instances should *NOT* fput() the file,
860+
no matter what. Everything is handled by the caller.

Documentation/kbuild/kbuild.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ This is solely useful to speed up test compiles.
237237
KBUILD_EXTRA_SYMBOLS
238238
--------------------
239239
For modules that use symbols from other modules.
240-
See more details in modules.txt.
240+
See more details in modules.rst.
241241

242242
ALLSOURCE_ARCHS
243243
---------------

Documentation/kbuild/kconfig-macro-language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ intermediate::
4444
def_bool y
4545

4646
Then, Kconfig moves onto the evaluation stage to resolve inter-symbol
47-
dependency as explained in kconfig-language.txt.
47+
dependency as explained in kconfig-language.rst.
4848

4949

5050
Variables

Documentation/kbuild/makefiles.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ When kbuild executes, the following steps are followed (roughly):
924924
$(KBUILD_AFLAGS_MODULE) is used to add arch-specific options that
925925
are used for assembler.
926926

927-
From commandline AFLAGS_MODULE shall be used (see kbuild.txt).
927+
From commandline AFLAGS_MODULE shall be used (see kbuild.rst).
928928

929929
KBUILD_CFLAGS_KERNEL
930930
$(CC) options specific for built-in
@@ -937,15 +937,15 @@ When kbuild executes, the following steps are followed (roughly):
937937

938938
$(KBUILD_CFLAGS_MODULE) is used to add arch-specific options that
939939
are used for $(CC).
940-
From commandline CFLAGS_MODULE shall be used (see kbuild.txt).
940+
From commandline CFLAGS_MODULE shall be used (see kbuild.rst).
941941

942942
KBUILD_LDFLAGS_MODULE
943943
Options for $(LD) when linking modules
944944

945945
$(KBUILD_LDFLAGS_MODULE) is used to add arch-specific options
946946
used when linking modules. This is often a linker script.
947947

948-
From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).
948+
From commandline LDFLAGS_MODULE shall be used (see kbuild.rst).
949949

950950
KBUILD_LDS
951951

Documentation/kbuild/modules.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,9 +470,9 @@ build.
470470

471471
The syntax of the Module.symvers file is::
472472

473-
<CRC> <Symbol> <Namespace> <Module> <Export Type>
473+
<CRC> <Symbol> <Module> <Export Type> <Namespace>
474474

475-
0xe1cc2a05 usb_stor_suspend USB_STORAGE drivers/usb/storage/usb-storage EXPORT_SYMBOL_GPL
475+
0xe1cc2a05 usb_stor_suspend drivers/usb/storage/usb-storage EXPORT_SYMBOL_GPL USB_STORAGE
476476

477477
The fields are separated by tabs and values may be empty (e.g.
478478
if no namespace is defined for an exported symbol).

Documentation/networking/devlink/devlink-region.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ example usage
4040
# Delete a snapshot using:
4141
$ devlink region del pci/0000:00:05.0/cr-space snapshot 1
4242
43-
# Trigger (request) a snapshot be taken:
44-
$ devlink region trigger pci/0000:00:05.0/cr-space
45-
4643
# Dump a snapshot:
4744
$ devlink region dump pci/0000:00:05.0/fw-health snapshot 1
4845
0000000000000000 0014 95dc 0014 9514 0035 1670 0034 db30

Documentation/networking/net_failover.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Overview
88
========
99

1010
The net_failover driver provides an automated failover mechanism via APIs
11-
to create and destroy a failover master netdev and mananges a primary and
11+
to create and destroy a failover master netdev and manages a primary and
1212
standby slave netdevs that get registered via the generic failover
13-
infrastructrure.
13+
infrastructure.
1414

1515
The failover netdev acts a master device and controls 2 slave devices. The
1616
original paravirtual interface is registered as 'standby' slave netdev and
@@ -29,7 +29,7 @@ virtio-net accelerated datapath: STANDBY mode
2929
=============================================
3030

3131
net_failover enables hypervisor controlled accelerated datapath to virtio-net
32-
enabled VMs in a transparent manner with no/minimal guest userspace chanages.
32+
enabled VMs in a transparent manner with no/minimal guest userspace changes.
3333

3434
To support this, the hypervisor needs to enable VIRTIO_NET_F_STANDBY
3535
feature on the virtio-net interface and assign the same MAC address to both

0 commit comments

Comments
 (0)