Skip to content

Commit e5c7bcc

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

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
@@ -2488,7 +2488,7 @@ N: sc27xx
24882488
N: sc2731
24892489

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

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

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

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

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

60066006
DRM DRIVERS FOR STI
60076007
M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
6008-
M: Vincent Abriou <vincent.abriou@st.com>
60096008
L: dri-devel@lists.freedesktop.org
60106009
S: Maintained
60116010
T: git git://anongit.freedesktop.org/drm/drm-misc
60126011
F: Documentation/devicetree/bindings/display/st,stih4xx.txt
60136012
F: drivers/gpu/drm/sti
60146013

60156014
DRM DRIVERS FOR STM
6016-
M: Yannick Fertre <yannick.fertre@st.com>
6017-
M: Philippe Cornu <philippe.cornu@st.com>
6015+
M: Yannick Fertre <yannick.fertre@foss.st.com>
6016+
M: Philippe Cornu <philippe.cornu@foss.st.com>
60186017
M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
6019-
M: Vincent Abriou <vincent.abriou@st.com>
60206018
L: dri-devel@lists.freedesktop.org
60216019
S: Maintained
60226020
T: git git://anongit.freedesktop.org/drm/drm-misc
@@ -7467,8 +7465,9 @@ F: include/uapi/asm-generic/
74677465
GENERIC PHY FRAMEWORK
74687466
M: Kishon Vijay Abraham I <kishon@ti.com>
74697467
M: Vinod Koul <vkoul@kernel.org>
7470-
L: linux-kernel@vger.kernel.org
7468+
L: linux-phy@lists.infradead.org
74717469
S: Supported
7470+
Q: https://patchwork.kernel.org/project/linux-phy/list/
74727471
T: git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
74737472
F: Documentation/devicetree/bindings/phy/
74747473
F: drivers/phy/
@@ -8221,7 +8220,7 @@ F: include/linux/hugetlb.h
82218220
F: mm/hugetlb.c
82228221

82238222
HVA ST MEDIA DRIVER
8224-
M: Jean-Christophe Trotin <jean-christophe.trotin@st.com>
8223+
M: Jean-Christophe Trotin <jean-christophe.trotin@foss.st.com>
82258224
L: linux-media@vger.kernel.org
82268225
S: Supported
82278226
W: https://linuxtv.org
@@ -8511,6 +8510,7 @@ IBM Power SRIOV Virtual NIC Device Driver
85118510
M: Dany Madden <drt@linux.ibm.com>
85128511
M: Lijun Pan <ljp@linux.ibm.com>
85138512
M: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
8513+
R: Thomas Falcon <tlfalcon@linux.ibm.com>
85148514
L: netdev@vger.kernel.org
85158515
S: Supported
85168516
F: drivers/net/ethernet/ibm/ibmvnic.*
@@ -10032,7 +10032,6 @@ F: scripts/leaking_addresses.pl
1003210032

1003310033
LED SUBSYSTEM
1003410034
M: Pavel Machek <pavel@ucw.cz>
10035-
R: Dan Murphy <dmurphy@ti.com>
1003610035
L: linux-leds@vger.kernel.org
1003710036
S: Maintained
1003810037
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git
@@ -10908,7 +10907,6 @@ T: git git://linuxtv.org/media_tree.git
1090810907
F: drivers/media/radio/radio-maxiradio*
1090910908

1091010909
MCAN MMIO DEVICE DRIVER
10911-
M: Dan Murphy <dmurphy@ti.com>
1091210910
M: Pankaj Sharma <pankj.sharma@samsung.com>
1091310911
L: linux-can@vger.kernel.org
1091410912
S: Maintained
@@ -11169,7 +11167,7 @@ T: git git://linuxtv.org/media_tree.git
1116911167
F: drivers/media/dvb-frontends/stv6111*
1117011168

1117111169
MEDIA DRIVERS FOR STM32 - DCMI
11172-
M: Hugues Fruchet <hugues.fruchet@st.com>
11170+
M: Hugues Fruchet <hugues.fruchet@foss.st.com>
1117311171
L: linux-media@vger.kernel.org
1117411172
S: Supported
1117511173
T: git git://linuxtv.org/media_tree.git
@@ -12540,7 +12538,7 @@ NETWORKING [MPTCP]
1254012538
M: Mat Martineau <mathew.j.martineau@linux.intel.com>
1254112539
M: Matthieu Baerts <matthieu.baerts@tessares.net>
1254212540
L: netdev@vger.kernel.org
12543-
L: mptcp@lists.01.org
12541+
L: mptcp@lists.linux.dev
1254412542
S: Maintained
1254512543
W: https://github.com/multipath-tcp/mptcp_net-next/wiki
1254612544
B: https://github.com/multipath-tcp/mptcp_net-next/issues
@@ -14711,15 +14709,11 @@ F: drivers/net/ethernet/qlogic/qlcnic/
1471114709
QLOGIC QLGE 10Gb ETHERNET DRIVER
1471214710
M: Manish Chopra <manishc@marvell.com>
1471314711
M: GR-Linux-NIC-Dev@marvell.com
14714-
L: netdev@vger.kernel.org
14715-
S: Supported
14716-
F: drivers/staging/qlge/
14717-
14718-
QLOGIC QLGE 10Gb ETHERNET DRIVER
1471914712
M: Coiby Xu <coiby.xu@gmail.com>
1472014713
L: netdev@vger.kernel.org
14721-
S: Maintained
14714+
S: Supported
1472214715
F: Documentation/networking/device_drivers/qlogic/qlge.rst
14716+
F: drivers/staging/qlge/
1472314717

1472414718
QM1D1B0004 MEDIA DRIVER
1472514719
M: Akihiro Tsukada <tskd08@gmail.com>
@@ -15637,8 +15631,8 @@ F: Documentation/s390/pci.rst
1563715631

1563815632
S390 VFIO AP DRIVER
1563915633
M: Tony Krowiak <akrowiak@linux.ibm.com>
15640-
M: Pierre Morel <pmorel@linux.ibm.com>
1564115634
M: Halil Pasic <pasic@linux.ibm.com>
15635+
M: Jason Herne <jjherne@linux.ibm.com>
1564215636
L: linux-s390@vger.kernel.org
1564315637
S: Supported
1564415638
W: http://www.ibm.com/developerworks/linux/linux390/
@@ -15650,6 +15644,7 @@ F: drivers/s390/crypto/vfio_ap_private.h
1565015644
S390 VFIO-CCW DRIVER
1565115645
M: Cornelia Huck <cohuck@redhat.com>
1565215646
M: Eric Farman <farman@linux.ibm.com>
15647+
M: Matthew Rosato <mjrosato@linux.ibm.com>
1565315648
R: Halil Pasic <pasic@linux.ibm.com>
1565415649
L: linux-s390@vger.kernel.org
1565515650
L: kvm@vger.kernel.org
@@ -15660,6 +15655,7 @@ F: include/uapi/linux/vfio_ccw.h
1566015655

1566115656
S390 VFIO-PCI DRIVER
1566215657
M: Matthew Rosato <mjrosato@linux.ibm.com>
15658+
M: Eric Farman <farman@linux.ibm.com>
1566315659
L: linux-s390@vger.kernel.org
1566415660
L: kvm@vger.kernel.org
1566515661
S: Supported
@@ -16889,8 +16885,10 @@ F: tools/spi/
1688916885

1689016886
SPIDERNET NETWORK DRIVER for CELL
1689116887
M: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
16888+
M: Geoff Levand <geoff@infradead.org>
1689216889
L: netdev@vger.kernel.org
16893-
S: Supported
16890+
L: linuxppc-dev@lists.ozlabs.org
16891+
S: Maintained
1689416892
F: Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
1689516893
F: drivers/net/ethernet/toshiba/spider_net*
1689616894

@@ -16944,7 +16942,8 @@ F: Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt
1694416942
F: drivers/media/i2c/st-mipid02.c
1694516943

1694616944
ST STM32 I2C/SMBUS DRIVER
16947-
M: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
16945+
M: Pierre-Yves MORDRET <pierre-yves.mordret@foss.st.com>
16946+
M: Alain Volmat <alain.volmat@foss.st.com>
1694816947
L: linux-i2c@vger.kernel.org
1694916948
S: Maintained
1695016949
F: drivers/i2c/busses/i2c-stm32*
@@ -17069,7 +17068,7 @@ F: kernel/jump_label.c
1706917068
F: kernel/static_call.c
1707017069

1707117070
STI AUDIO (ASoC) DRIVERS
17072-
M: Arnaud Pouliquen <arnaud.pouliquen@st.com>
17071+
M: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
1707317072
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1707417073
S: Maintained
1707517074
F: Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
@@ -17089,15 +17088,15 @@ T: git git://linuxtv.org/media_tree.git
1708917088
F: drivers/media/usb/stk1160/
1709017089

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

1709917098
STM32 TIMER/LPTIMER DRIVERS
17100-
M: Fabrice Gasnier <fabrice.gasnier@st.com>
17099+
M: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
1710117100
S: Maintained
1710217101
F: Documentation/ABI/testing/*timer-stm32
1710317102
F: Documentation/devicetree/bindings/*/*stm32-*timer*
@@ -17107,7 +17106,7 @@ F: include/linux/*/stm32-*tim*
1710717106

1710817107
STMMAC ETHERNET DRIVER
1710917108
M: Giuseppe Cavallaro <peppe.cavallaro@st.com>
17110-
M: Alexandre Torgue <alexandre.torgue@st.com>
17109+
M: Alexandre Torgue <alexandre.torgue@foss.st.com>
1711117110
M: Jose Abreu <joabreu@synopsys.com>
1711217111
L: netdev@vger.kernel.org
1711317112
S: Supported
@@ -17856,7 +17855,6 @@ S: Maintained
1785617855
F: drivers/thermal/ti-soc-thermal/
1785717856

1785817857
TI BQ27XXX POWER SUPPLY DRIVER
17859-
R: Dan Murphy <dmurphy@ti.com>
1786017858
F: drivers/power/supply/bq27xxx_battery.c
1786117859
F: drivers/power/supply/bq27xxx_battery_i2c.c
1786217860
F: include/linux/power/bq27xxx_battery.h
@@ -17991,7 +17989,6 @@ S: Odd Fixes
1799117989
F: sound/soc/codecs/tas571x*
1799217990

1799317991
TI TCAN4X5X DEVICE DRIVER
17994-
M: Dan Murphy <dmurphy@ti.com>
1799517992
L: linux-can@vger.kernel.org
1799617993
S: Maintained
1799717994
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)