Skip to content

Commit 59c4e19

Browse files
brooniebroonie
committed
Merge tag 'v5.15-rc3' into spi-5.15
Linux 5.15-rc3
2 parents 6840615 + 5816b3e commit 59c4e19

File tree

396 files changed

+3347
-1806
lines changed

Some content is hidden

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

396 files changed

+3347
-1806
lines changed

‎Documentation/core-api/irq/irq-domain.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that
175175
case the Linux IRQ numbers cannot be dynamically assigned and the legacy
176176
mapping should be used.
177177

178-
As the name implies, the *_legacy() functions are deprecated and only
178+
As the name implies, the \*_legacy() functions are deprecated and only
179179
exist to ease the support of ancient platforms. No new users should be
180-
added.
180+
added. Same goes for the \*_simple() functions when their use results
181+
in the legacy behaviour.
181182

182183
The legacy map assumes a contiguous range of IRQ numbers has already
183184
been allocated for the controller and that the IRQ number can be

‎Documentation/networking/device_drivers/ethernet/intel/ice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ NOTES:
851851
- 0x88A8 traffic will not be received unless VLAN stripping is disabled with
852852
the following command::
853853

854-
# ethool -K <ethX> rxvlan off
854+
# ethtool -K <ethX> rxvlan off
855855

856856
- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS
857857
configured on the same port. 0x88a8/0x8100 traffic will not be received if

‎MAINTAINERS

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -977,12 +977,12 @@ L: [email protected]
977977
S: Maintained
978978
F: drivers/platform/x86/amd-pmc.*
979979

980-
AMD POWERPLAY
980+
AMD POWERPLAY AND SWSMU
981981
M: Evan Quan <[email protected]>
982982
L: [email protected]
983983
S: Supported
984984
T: git https://gitlab.freedesktop.org/agd5f/linux.git
985-
F: drivers/gpu/drm/amd/pm/powerplay/
985+
F: drivers/gpu/drm/amd/pm/
986986

987987
AMD PTDMA DRIVER
988988
M: Sanjay R Mehta <[email protected]>
@@ -2804,9 +2804,8 @@ F: arch/arm/mach-pxa/include/mach/vpac270.h
28042804
F: arch/arm/mach-pxa/vpac270.c
28052805

28062806
ARM/VT8500 ARM ARCHITECTURE
2807-
M: Tony Prisk <[email protected]>
28082807
L: [email protected] (moderated for non-subscribers)
2809-
S: Maintained
2808+
S: Orphan
28102809
F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt
28112810
F: arch/arm/mach-vt8500/
28122811
F: drivers/clocksource/timer-vt8500.c
@@ -13255,9 +13254,9 @@ F: Documentation/scsi/NinjaSCSI.rst
1325513254
F: drivers/scsi/nsp32*
1325613255

1325713256
NIOS2 ARCHITECTURE
13258-
M: Ley Foon Tan <[email protected]>
13257+
M: Dinh Nguyen <[email protected]>
1325913258
S: Maintained
13260-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
13259+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
1326113260
F: arch/nios2/
1326213261

1326313262
NITRO ENCLAVES (NE)
@@ -16651,13 +16650,6 @@ M: Lubomir Rintel <[email protected]>
1665116650
S: Supported
1665216651
F: drivers/char/pcmcia/scr24x_cs.c
1665316652

16654-
SCSI CDROM DRIVER
16655-
M: Jens Axboe <[email protected]>
16656-
L: [email protected]
16657-
S: Maintained
16658-
W: http://www.kernel.dk
16659-
F: drivers/scsi/sr*
16660-
1666116653
SCSI RDMA PROTOCOL (SRP) INITIATOR
1666216654
M: Bart Van Assche <[email protected]>
1666316655
L: [email protected]
@@ -16956,7 +16948,6 @@ F: drivers/misc/sgi-xp/
1695616948

1695716949
SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
1695816950
M: Karsten Graul <[email protected]>
16959-
M: Guvenc Gulce <[email protected]>
1696016951
L: [email protected]
1696116952
S: Supported
1696216953
W: http://www.ibm.com/developerworks/linux/linux390/
@@ -17969,10 +17960,11 @@ F: Documentation/admin-guide/svga.rst
1796917960
F: arch/x86/boot/video*
1797017961

1797117962
SWIOTLB SUBSYSTEM
17972-
M: Konrad Rzeszutek Wilk <[email protected]>
17963+
M: Christoph Hellwig <[email protected]>
1797317964
L: [email protected]
1797417965
S: Supported
17975-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
17966+
W: http://git.infradead.org/users/hch/dma-mapping.git
17967+
T: git git://git.infradead.org/users/hch/dma-mapping.git
1797617968
F: arch/*/kernel/pci-swiotlb.c
1797717969
F: include/linux/swiotlb.h
1797817970
F: kernel/dma/swiotlb.c
@@ -19289,13 +19281,12 @@ S: Maintained
1928919281
F: drivers/usb/misc/chaoskey.c
1929019282

1929119283
USB CYPRESS C67X00 DRIVER
19292-
M: Peter Korsgaard <[email protected]>
1929319284
L: [email protected]
19294-
S: Maintained
19285+
S: Orphan
1929519286
F: drivers/usb/c67x00/
1929619287

1929719288
USB DAVICOM DM9601 DRIVER
19298-
M: Peter Korsgaard <[email protected]>
19289+
M: Peter Korsgaard <[email protected]>
1929919290
L: [email protected]
1930019291
S: Maintained
1930119292
W: http://www.linux-usb.org/usbnet
@@ -20475,7 +20466,6 @@ F: samples/bpf/xdpsock*
2047520466
F: tools/lib/bpf/xsk*
2047620467

2047720468
XEN BLOCK SUBSYSTEM
20478-
M: Konrad Rzeszutek Wilk <[email protected]>
2047920469
M: Roger Pau Monné <[email protected]>
2048020470
L: [email protected] (moderated for non-subscribers)
2048120471
S: Supported
@@ -20523,7 +20513,7 @@ S: Supported
2052320513
F: drivers/net/xen-netback/*
2052420514

2052520515
XEN PCI SUBSYSTEM
20526-
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
20516+
M: Juergen Gross <jgross@suse.com>
2052720517
L: [email protected] (moderated for non-subscribers)
2052820518
S: Supported
2052920519
F: arch/x86/pci/*xen*
@@ -20546,7 +20536,8 @@ S: Supported
2054620536
F: sound/xen/*
2054720537

2054820538
XEN SWIOTLB SUBSYSTEM
20549-
M: Konrad Rzeszutek Wilk <[email protected]>
20539+
M: Juergen Gross <[email protected]>
20540+
M: Stefano Stabellini <[email protected]>
2055020541
L: [email protected] (moderated for non-subscribers)
2055120542
L: [email protected]
2055220543
S: Supported

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 15
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc3
66
NAME = Opossums on Parade
77

88
# *DOCUMENTATION*

‎arch/arm/kernel/signal.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
628628
uprobe_notify_resume(regs);
629629
} else {
630630
tracehook_notify_resume(regs);
631-
rseq_handle_notify_resume(NULL, regs);
632631
}
633632
}
634633
local_irq_disable();

‎arch/arm64/boot/dts/qcom/ipq8074.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,6 @@
487487
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
488488
phys = <&qusb_phy_0>, <&usb0_ssphy>;
489489
phy-names = "usb2-phy", "usb3-phy";
490-
tx-fifo-resize;
491490
snps,is-utmi-l1-suspend;
492491
snps,hird-threshold = /bits/ 8 <0x0>;
493492
snps,dis_u2_susphy_quirk;
@@ -528,7 +527,6 @@
528527
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
529528
phys = <&qusb_phy_1>, <&usb1_ssphy>;
530529
phy-names = "usb2-phy", "usb3-phy";
531-
tx-fifo-resize;
532530
snps,is-utmi-l1-suspend;
533531
snps,hird-threshold = /bits/ 8 <0x0>;
534532
snps,dis_u2_susphy_quirk;

‎arch/arm64/include/asm/acpi.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ pgprot_t __acpi_get_mem_attribute(phys_addr_t addr);
5050
void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size);
5151
#define acpi_os_ioremap acpi_os_ioremap
5252

53-
void __iomem *acpi_os_memmap(acpi_physical_address phys, acpi_size size);
54-
#define acpi_os_memmap acpi_os_memmap
55-
5653
typedef u64 phys_cpuid_t;
5754
#define PHYS_CPUID_INVALID INVALID_HWID
5855

‎arch/arm64/include/asm/assembler.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,11 @@ alternative_endif
525525
#define EXPORT_SYMBOL_NOKASAN(name) EXPORT_SYMBOL(name)
526526
#endif
527527

528+
#ifdef CONFIG_KASAN_HW_TAGS
529+
#define EXPORT_SYMBOL_NOHWKASAN(name)
530+
#else
531+
#define EXPORT_SYMBOL_NOHWKASAN(name) EXPORT_SYMBOL_NOKASAN(name)
532+
#endif
528533
/*
529534
* Emit a 64-bit absolute little endian symbol reference in a way that
530535
* ensures that it will be resolved at build time, even when building a

‎arch/arm64/include/asm/mte.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,17 @@ void mte_check_tfsr_el1(void);
9999

100100
static inline void mte_check_tfsr_entry(void)
101101
{
102+
if (!system_supports_mte())
103+
return;
104+
102105
mte_check_tfsr_el1();
103106
}
104107

105108
static inline void mte_check_tfsr_exit(void)
106109
{
110+
if (!system_supports_mte())
111+
return;
112+
107113
/*
108114
* The asynchronous faults are sync'ed automatically with
109115
* TFSR_EL1 on kernel entry but for exit an explicit dsb()

‎arch/arm64/include/asm/string.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ extern char *strrchr(const char *, int c);
1212
#define __HAVE_ARCH_STRCHR
1313
extern char *strchr(const char *, int c);
1414

15+
#ifndef CONFIG_KASAN_HW_TAGS
1516
#define __HAVE_ARCH_STRCMP
1617
extern int strcmp(const char *, const char *);
1718

1819
#define __HAVE_ARCH_STRNCMP
1920
extern int strncmp(const char *, const char *, __kernel_size_t);
21+
#endif
2022

2123
#define __HAVE_ARCH_STRLEN
2224
extern __kernel_size_t strlen(const char *);

0 commit comments

Comments
 (0)