Skip to content

Commit b20e829

Browse files
gregkhgregkh
committed
Merge 5.12-rc6 into driver-core-next
We need the driver core fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents f7514a6 + e49d033 commit b20e829

File tree

493 files changed

+4534
-2126
lines changed

Some content is hidden

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

493 files changed

+4534
-2126
lines changed

‎.mailmap

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Andrew Morton <akpm@linux-foundation.org>
3636
Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>
3737
Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
3838
Andrew Vasquez <andrew.vasquez@qlogic.com>
39+
Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>
3940
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
4041
Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
4142
Andy Adamson <andros@citi.umich.edu>
@@ -65,6 +66,8 @@ Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
6566
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
6667
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
6768
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
69+
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
70+
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
6871
Christophe Ricard <christophe.ricard@gmail.com>
6972
Christoph Hellwig <hch@lst.de>
7073
Corey Minyard <minyard@acm.org>

‎Documentation/arm64/acpi_object_usage.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ For ACPI on arm64, tables also fall into the following categories:
1717

1818
- Recommended: BERT, EINJ, ERST, HEST, PCCT, SSDT
1919

20-
- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IORT,
21-
MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT, STAO,
22-
TCPA, TPM2, UEFI, XENV
20+
- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IBFT,
21+
IORT, MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT,
22+
STAO, TCPA, TPM2, UEFI, XENV
2323

24-
- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IBFT, IVRS, LPIT,
25-
MSDM, OEMx, PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
24+
- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IVRS, LPIT, MSDM, OEMx,
25+
PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
2626

2727
====== ========================================================================
2828
Table Usage for ARMv8 Linux

‎Documentation/arm64/silicon-errata.rst

+3
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ stable kernels.
130130
| Marvell | ARM-MMU-500 | #582743 | N/A |
131131
+----------------+-----------------+-----------------+-----------------------------+
132132
+----------------+-----------------+-----------------+-----------------------------+
133+
| NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM |
134+
+----------------+-----------------+-----------------+-----------------------------+
135+
+----------------+-----------------+-----------------+-----------------------------+
133136
| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 |
134137
+----------------+-----------------+-----------------+-----------------------------+
135138
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/networking/device_drivers/ethernet/amazon/ena.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ DATA PATH
267267
Tx
268268
--
269269

270-
end_start_xmit() is called by the stack. This function does the following:
270+
ena_start_xmit() is called by the stack. This function does the following:
271271

272272
- Maps data buffers (skb->data and frags).
273273
- Populates ena_buf for the push buffer (if the driver and device are

‎Documentation/networking/devlink/devlink-dpipe.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ purposes as a standard complementary tool. The system's view from
5252
``devlink-dpipe`` should change according to the changes done by the
5353
standard configuration tools.
5454

55-
For example, it’s quiet common to implement Access Control Lists (ACL)
55+
For example, it’s quite common to implement Access Control Lists (ACL)
5656
using Ternary Content Addressable Memory (TCAM). The TCAM memory can be
5757
divided into TCAM regions. Complex TC filters can have multiple rules with
5858
different priorities and different lookup keys. On the other hand hardware

‎Documentation/networking/devlink/devlink-port.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ representor netdevice.
151151
-------------
152152
A subfunction devlink port is created but it is not active yet. That means the
153153
entities are created on devlink side, the e-switch port representor is created,
154-
but the subfunction device itself it not created. A user might use e-switch port
154+
but the subfunction device itself is not created. A user might use e-switch port
155155
representor to do settings, putting it into bridge, adding TC rules, etc. A user
156156
might as well configure the hardware address (such as MAC address) of the
157157
subfunction while subfunction is inactive.
@@ -173,7 +173,7 @@ Terms and Definitions
173173
* - Term
174174
- Definitions
175175
* - ``PCI device``
176-
- A physical PCI device having one or more PCI bus consists of one or
176+
- A physical PCI device having one or more PCI buses consists of one or
177177
more PCI controllers.
178178
* - ``PCI controller``
179179
- A controller consists of potentially multiple physical functions,

‎Documentation/networking/xfrm_device.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Callbacks to implement
5050

5151
The NIC driver offering ipsec offload will need to implement these
5252
callbacks to make the offload available to the network stack's
53-
XFRM subsytem. Additionally, the feature bits NETIF_F_HW_ESP and
53+
XFRM subsystem. Additionally, the feature bits NETIF_F_HW_ESP and
5454
NETIF_F_HW_ESP_TX_CSUM will signal the availability of the offload.
5555

5656

‎MAINTAINERS

+28-31
Original file line numberDiff line numberDiff line change
@@ -2489,7 +2489,7 @@ N: sc27xx
24892489
N: sc2731
24902490

24912491
ARM/STI ARCHITECTURE
2492-
M: Patrice Chotard <patrice.chotard@st.com>
2492+
M: Patrice Chotard <patrice.chotard@foss.st.com>
24932493
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
24942494
S: Maintained
24952495
W: http://www.stlinux.com
@@ -2522,7 +2522,7 @@ F: include/linux/remoteproc/st_slim_rproc.h
25222522

25232523
ARM/STM32 ARCHITECTURE
25242524
M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
2525-
M: Alexandre Torgue <alexandre.torgue@st.com>
2525+
M: Alexandre Torgue <alexandre.torgue@foss.st.com>
25262526
L: linux-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
25272527
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
25282528
S: Maintained
@@ -3115,7 +3115,7 @@ C: irc://irc.oftc.net/bcache
31153115
F: drivers/md/bcache/
31163116

31173117
BDISP ST MEDIA DRIVER
3118-
M: Fabien Dessenne <fabien.dessenne@st.com>
3118+
M: Fabien Dessenne <fabien.dessenne@foss.st.com>
31193119
L: linux-media@vger.kernel.org
31203120
S: Supported
31213121
W: https://linuxtv.org
@@ -3675,7 +3675,7 @@ M: bcm-kernel-feedback-list@broadcom.com
36753675
L: linux-pm@vger.kernel.org
36763676
S: Maintained
36773677
T: git git://github.com/broadcom/stblinux.git
3678-
F: drivers/soc/bcm/bcm-pmb.c
3678+
F: drivers/soc/bcm/bcm63xx/bcm-pmb.c
36793679
F: include/dt-bindings/soc/bcm-pmb.h
36803680

36813681
BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@ -5080,7 +5080,7 @@ S: Maintained
50805080
F: drivers/platform/x86/dell/dell-wmi.c
50815081

50825082
DELTA ST MEDIA DRIVER
5083-
M: Hugues Fruchet <hugues.fruchet@st.com>
5083+
M: Hugues Fruchet <hugues.fruchet@foss.st.com>
50845084
L: linux-media@vger.kernel.org
50855085
S: Supported
50865086
W: https://linuxtv.org
@@ -6012,18 +6012,16 @@ F: drivers/gpu/drm/rockchip/
60126012

60136013
DRM DRIVERS FOR STI
60146014
M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
6015-
M: Vincent Abriou <vincent.abriou@st.com>
60166015
L: dri-devel@lists.freedesktop.org
60176016
S: Maintained
60186017
T: git git://anongit.freedesktop.org/drm/drm-misc
60196018
F: Documentation/devicetree/bindings/display/st,stih4xx.txt
60206019
F: drivers/gpu/drm/sti
60216020

60226021
DRM DRIVERS FOR STM
6023-
M: Yannick Fertre <yannick.fertre@st.com>
6024-
M: Philippe Cornu <philippe.cornu@st.com>
6022+
M: Yannick Fertre <yannick.fertre@foss.st.com>
6023+
M: Philippe Cornu <philippe.cornu@foss.st.com>
60256024
M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
6026-
M: Vincent Abriou <vincent.abriou@st.com>
60276025
L: dri-devel@lists.freedesktop.org
60286026
S: Maintained
60296027
T: git git://anongit.freedesktop.org/drm/drm-misc
@@ -7482,8 +7480,9 @@ F: include/uapi/asm-generic/
74827480
GENERIC PHY FRAMEWORK
74837481
M: Kishon Vijay Abraham I <kishon@ti.com>
74847482
M: Vinod Koul <vkoul@kernel.org>
7485-
L: linux-kernel@vger.kernel.org
7483+
L: linux-phy@lists.infradead.org
74867484
S: Supported
7485+
Q: https://patchwork.kernel.org/project/linux-phy/list/
74877486
T: git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
74887487
F: Documentation/devicetree/bindings/phy/
74897488
F: drivers/phy/
@@ -8236,7 +8235,7 @@ F: include/linux/hugetlb.h
82368235
F: mm/hugetlb.c
82378236

82388237
HVA ST MEDIA DRIVER
8239-
M: Jean-Christophe Trotin <jean-christophe.trotin@st.com>
8238+
M: Jean-Christophe Trotin <jean-christophe.trotin@foss.st.com>
82408239
L: linux-media@vger.kernel.org
82418240
S: Supported
82428241
W: https://linuxtv.org
@@ -8526,6 +8525,7 @@ IBM Power SRIOV Virtual NIC Device Driver
85268525
M: Dany Madden <drt@linux.ibm.com>
85278526
M: Lijun Pan <ljp@linux.ibm.com>
85288527
M: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
8528+
R: Thomas Falcon <tlfalcon@linux.ibm.com>
85298529
L: netdev@vger.kernel.org
85308530
S: Supported
85318531
F: drivers/net/ethernet/ibm/ibmvnic.*
@@ -10035,7 +10035,6 @@ F: scripts/leaking_addresses.pl
1003510035

1003610036
LED SUBSYSTEM
1003710037
M: Pavel Machek <pavel@ucw.cz>
10038-
R: Dan Murphy <dmurphy@ti.com>
1003910038
L: linux-leds@vger.kernel.org
1004010039
S: Maintained
1004110040
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git
@@ -10911,7 +10910,6 @@ T: git git://linuxtv.org/media_tree.git
1091110910
F: drivers/media/radio/radio-maxiradio*
1091210911

1091310912
MCAN MMIO DEVICE DRIVER
10914-
M: Dan Murphy <dmurphy@ti.com>
1091510913
M: Pankaj Sharma <pankj.sharma@samsung.com>
1091610914
L: linux-can@vger.kernel.org
1091710915
S: Maintained
@@ -11172,7 +11170,7 @@ T: git git://linuxtv.org/media_tree.git
1117211170
F: drivers/media/dvb-frontends/stv6111*
1117311171

1117411172
MEDIA DRIVERS FOR STM32 - DCMI
11175-
M: Hugues Fruchet <hugues.fruchet@st.com>
11173+
M: Hugues Fruchet <hugues.fruchet@foss.st.com>
1117611174
L: linux-media@vger.kernel.org
1117711175
S: Supported
1117811176
T: git git://linuxtv.org/media_tree.git
@@ -12543,7 +12541,7 @@ NETWORKING [MPTCP]
1254312541
M: Mat Martineau <mathew.j.martineau@linux.intel.com>
1254412542
M: Matthieu Baerts <matthieu.baerts@tessares.net>
1254512543
L: netdev@vger.kernel.org
12546-
L: mptcp@lists.01.org
12544+
L: mptcp@lists.linux.dev
1254712545
S: Maintained
1254812546
W: https://github.com/multipath-tcp/mptcp_net-next/wiki
1254912547
B: https://github.com/multipath-tcp/mptcp_net-next/issues
@@ -14714,15 +14712,11 @@ F: drivers/net/ethernet/qlogic/qlcnic/
1471414712
QLOGIC QLGE 10Gb ETHERNET DRIVER
1471514713
M: Manish Chopra <manishc@marvell.com>
1471614714
M: GR-Linux-NIC-Dev@marvell.com
14717-
L: netdev@vger.kernel.org
14718-
S: Supported
14719-
F: drivers/staging/qlge/
14720-
14721-
QLOGIC QLGE 10Gb ETHERNET DRIVER
1472214715
M: Coiby Xu <coiby.xu@gmail.com>
1472314716
L: netdev@vger.kernel.org
14724-
S: Maintained
14717+
S: Supported
1472514718
F: Documentation/networking/device_drivers/qlogic/qlge.rst
14719+
F: drivers/staging/qlge/
1472614720

1472714721
QM1D1B0004 MEDIA DRIVER
1472814722
M: Akihiro Tsukada <tskd08@gmail.com>
@@ -15640,8 +15634,8 @@ F: Documentation/s390/pci.rst
1564015634

1564115635
S390 VFIO AP DRIVER
1564215636
M: Tony Krowiak <akrowiak@linux.ibm.com>
15643-
M: Pierre Morel <pmorel@linux.ibm.com>
1564415637
M: Halil Pasic <pasic@linux.ibm.com>
15638+
M: Jason Herne <jjherne@linux.ibm.com>
1564515639
L: linux-s390@vger.kernel.org
1564615640
S: Supported
1564715641
W: http://www.ibm.com/developerworks/linux/linux390/
@@ -15653,6 +15647,7 @@ F: drivers/s390/crypto/vfio_ap_private.h
1565315647
S390 VFIO-CCW DRIVER
1565415648
M: Cornelia Huck <cohuck@redhat.com>
1565515649
M: Eric Farman <farman@linux.ibm.com>
15650+
M: Matthew Rosato <mjrosato@linux.ibm.com>
1565615651
R: Halil Pasic <pasic@linux.ibm.com>
1565715652
L: linux-s390@vger.kernel.org
1565815653
L: kvm@vger.kernel.org
@@ -15663,6 +15658,7 @@ F: include/uapi/linux/vfio_ccw.h
1566315658

1566415659
S390 VFIO-PCI DRIVER
1566515660
M: Matthew Rosato <mjrosato@linux.ibm.com>
15661+
M: Eric Farman <farman@linux.ibm.com>
1566615662
L: linux-s390@vger.kernel.org
1566715663
L: kvm@vger.kernel.org
1566815664
S: Supported
@@ -16892,8 +16888,10 @@ F: tools/spi/
1689216888

1689316889
SPIDERNET NETWORK DRIVER for CELL
1689416890
M: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
16891+
M: Geoff Levand <geoff@infradead.org>
1689516892
L: netdev@vger.kernel.org
16896-
S: Supported
16893+
L: linuxppc-dev@lists.ozlabs.org
16894+
S: Maintained
1689716895
F: Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
1689816896
F: drivers/net/ethernet/toshiba/spider_net*
1689916897

@@ -16947,7 +16945,8 @@ F: Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt
1694716945
F: drivers/media/i2c/st-mipid02.c
1694816946

1694916947
ST STM32 I2C/SMBUS DRIVER
16950-
M: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
16948+
M: Pierre-Yves MORDRET <pierre-yves.mordret@foss.st.com>
16949+
M: Alain Volmat <alain.volmat@foss.st.com>
1695116950
L: linux-i2c@vger.kernel.org
1695216951
S: Maintained
1695316952
F: drivers/i2c/busses/i2c-stm32*
@@ -17072,7 +17071,7 @@ F: kernel/jump_label.c
1707217071
F: kernel/static_call.c
1707317072

1707417073
STI AUDIO (ASoC) DRIVERS
17075-
M: Arnaud Pouliquen <arnaud.pouliquen@st.com>
17074+
M: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
1707617075
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1707717076
S: Maintained
1707817077
F: Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
@@ -17092,15 +17091,15 @@ T: git git://linuxtv.org/media_tree.git
1709217091
F: drivers/media/usb/stk1160/
1709317092

1709417093
STM32 AUDIO (ASoC) DRIVERS
17095-
M: Olivier Moysan <olivier.moysan@st.com>
17096-
M: Arnaud Pouliquen <arnaud.pouliquen@st.com>
17094+
M: Olivier Moysan <olivier.moysan@foss.st.com>
17095+
M: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
1709717096
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1709817097
S: Maintained
1709917098
F: Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
1710017099
F: sound/soc/stm/
1710117100

1710217101
STM32 TIMER/LPTIMER DRIVERS
17103-
M: Fabrice Gasnier <fabrice.gasnier@st.com>
17102+
M: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
1710417103
S: Maintained
1710517104
F: Documentation/ABI/testing/*timer-stm32
1710617105
F: Documentation/devicetree/bindings/*/*stm32-*timer*
@@ -17110,7 +17109,7 @@ F: include/linux/*/stm32-*tim*
1711017109

1711117110
STMMAC ETHERNET DRIVER
1711217111
M: Giuseppe Cavallaro <peppe.cavallaro@st.com>
17113-
M: Alexandre Torgue <alexandre.torgue@st.com>
17112+
M: Alexandre Torgue <alexandre.torgue@foss.st.com>
1711417113
M: Jose Abreu <joabreu@synopsys.com>
1711517114
L: netdev@vger.kernel.org
1711617115
S: Supported
@@ -17852,7 +17851,6 @@ S: Maintained
1785217851
F: drivers/thermal/ti-soc-thermal/
1785317852

1785417853
TI BQ27XXX POWER SUPPLY DRIVER
17855-
R: Dan Murphy <dmurphy@ti.com>
1785617854
F: drivers/power/supply/bq27xxx_battery.c
1785717855
F: drivers/power/supply/bq27xxx_battery_i2c.c
1785817856
F: include/linux/power/bq27xxx_battery.h
@@ -17987,7 +17985,6 @@ S: Odd Fixes
1798717985
F: sound/soc/codecs/tas571x*
1798817986

1798917987
TI TCAN4X5X DEVICE DRIVER
17990-
M: Dan Murphy <dmurphy@ti.com>
1799117988
L: linux-can@vger.kernel.org
1799217989
S: Maintained
1799317990
F: Documentation/devicetree/bindings/net/can/tcan4x5x.txt

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 12
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc4
5+
EXTRAVERSION = -rc6
66
NAME = Frozen Wasteland
77

88
# *DOCUMENTATION*

‎arch/arm/boot/dts/am33xx.dtsi

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
ethernet1 = &cpsw_emac1;
4141
spi0 = &spi0;
4242
spi1 = &spi1;
43+
mmc0 = &mmc1;
44+
mmc1 = &mmc2;
45+
mmc2 = &mmc3;
4346
};
4447

4548
cpus {

‎arch/arm/boot/dts/at91-sam9x60ek.dts

-8
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,6 @@
334334
};
335335

336336
&pinctrl {
337-
atmel,mux-mask = <
338-
/* A B C */
339-
0xFFFFFE7F 0xC0E0397F 0xEF00019D /* pioA */
340-
0x03FFFFFF 0x02FC7E68 0x00780000 /* pioB */
341-
0xffffffff 0xF83FFFFF 0xB800F3FC /* pioC */
342-
0x003FFFFF 0x003F8000 0x00000000 /* pioD */
343-
>;
344-
345337
adc {
346338
pinctrl_adc_default: adc_default {
347339
atmel,pins = <AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;

‎arch/arm/boot/dts/at91-sama5d27_som1.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
pinctrl-0 = <&pinctrl_macb0_default>;
8585
phy-mode = "rmii";
8686

87-
ethernet-phy@0 {
88-
reg = <0x0>;
87+
ethernet-phy@7 {
88+
reg = <0x7>;
8989
interrupt-parent = <&pioA>;
9090
interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>;
9191
pinctrl-names = "default";

0 commit comments

Comments
 (0)