Skip to content

Commit 233514f

Browse files
frank-wfrank-w
committed
Merge tag 'v5.15.190' into 5.15-main
This is the 5.15.190 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmiwZq0ACgkQONu9yGCS # aT5C2RAApeRwaJN213Dv5b0OnBhpSWeIbFLO06WYGhOzkh/0r3PrEBOHYt/Ix5Kl # zqngBXbNiekaReRx5Xn2djxT3jgei9d8rtVca1ImM/uC1Imanu7bNoNLeupwIdUu # i3NhYIGtjWYU22t8AP6xLNEHwVR4SVAwPEadTYZAG3Pwzb93wOJxPQqUOfxRwhyF # d1bhHKs3Oq+Twes83zy/IrYxwYH95dWjWi+FAZH2g1QPT45RoOZlKfKUXL19J2pC # 7wEvHEY946HbNGQv8DL/eni4M6uQkWl6hdHueLc4bYDPtB8XnU5Us3pKFLJTjbi4 # A2ACwh2tlqZRaUzzHG7lRZKUj6b4Ev55FFPedkJa8QkP6+GWLhtZglwMDf8GB9RS # hrFZyzUaKDjEPAUX7fhUBs8bw2o8XAG1bDHsiWfpo9LOr8YgrqlKmVeosCi57CIR # q6Ltdr/T5T2xQ1YZW83oNLTMJVFIv1CXlg+jRkvH2DGUJ5/QGWF64+sgxG0gnJjU # d0x7ELV8uJzOGserT6jHsOGDvT3EgULM6mA2te8WRJyPYgdFlHMSp++E5WA09hRZ # qpFTaAofJazIey1rCtg5bFaPjmFWj7WOBvudLmrmcN5N8wXbRWeg2N/F1tYhxN40 # IH1jMIyAX58PvMg+50mfEXpp2G0foeETNTpLhRb5qK3UFGMRNLM= # =+zfM # -----END PGP SIGNATURE----- # gpg: Signature made Thu Aug 28 16:24:45 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 948f294 + 01879f5 commit 233514f

677 files changed

Lines changed: 6071 additions & 2522 deletions

File tree

Some content is hidden

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

‎Documentation/filesystems/f2fs.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ usrjquota=<file> Appoint specified file and type during mount, so that quota
211211
grpjquota=<file> information can be properly updated during recovery flow,
212212
prjjquota=<file> <quota file>: must be in root directory;
213213
jqfmt=<quota type> <quota type>: [vfsold,vfsv0,vfsv1].
214-
offusrjquota Turn off user journalled quota.
215-
offgrpjquota Turn off group journalled quota.
216-
offprjjquota Turn off project journalled quota.
214+
usrjquota= Turn off user journalled quota.
215+
grpjquota= Turn off group journalled quota.
216+
prjjquota= Turn off project journalled quota.
217217
quota Enable plain user disk quota accounting.
218218
noquota Disable all plain disk quota option.
219219
whint_mode=%s Control which write hints are passed down to block

‎Documentation/firmware-guide/acpi/i2c-muxes.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Consider this topology::
1414
| | | 0x70 |--CH01--> i2c client B (0x50)
1515
+------+ +------+
1616

17-
which corresponds to the following ASL::
17+
which corresponds to the following ASL (in the scope of \_SB)::
1818

1919
Device (SMB1)
2020
{
@@ -24,7 +24,7 @@ which corresponds to the following ASL::
2424
Name (_HID, ...)
2525
Name (_CRS, ResourceTemplate () {
2626
I2cSerialBus (0x70, ControllerInitiated, I2C_SPEED,
27-
AddressingMode7Bit, "^SMB1", 0x00,
27+
AddressingMode7Bit, "\\_SB.SMB1", 0x00,
2828
ResourceConsumer,,)
2929
}
3030

@@ -37,7 +37,7 @@ which corresponds to the following ASL::
3737
Name (_HID, ...)
3838
Name (_CRS, ResourceTemplate () {
3939
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
40-
AddressingMode7Bit, "^CH00", 0x00,
40+
AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,
4141
ResourceConsumer,,)
4242
}
4343
}
@@ -52,7 +52,7 @@ which corresponds to the following ASL::
5252
Name (_HID, ...)
5353
Name (_CRS, ResourceTemplate () {
5454
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
55-
AddressingMode7Bit, "^CH01", 0x00,
55+
AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,
5656
ResourceConsumer,,)
5757
}
5858
}

‎Documentation/memory-barriers.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,6 +1894,7 @@ There are some more advanced barrier functions:
18941894

18951895
(*) dma_wmb();
18961896
(*) dma_rmb();
1897+
(*) dma_mb();
18971898

18981899
These are for use with consistent memory to guarantee the ordering
18991900
of writes or reads of shared memory accessible to both the CPU and a
@@ -1925,11 +1926,11 @@ There are some more advanced barrier functions:
19251926
The dma_rmb() allows us guarantee the device has released ownership
19261927
before we read the data from the descriptor, and the dma_wmb() allows
19271928
us to guarantee the data is written to the descriptor before the device
1928-
can see it now has ownership. Note that, when using writel(), a prior
1929-
wmb() is not needed to guarantee that the cache coherent memory writes
1930-
have completed before writing to the MMIO region. The cheaper
1931-
writel_relaxed() does not provide this guarantee and must not be used
1932-
here.
1929+
can see it now has ownership. The dma_mb() implies both a dma_rmb() and
1930+
a dma_wmb(). Note that, when using writel(), a prior wmb() is not needed
1931+
to guarantee that the cache coherent memory writes have completed before
1932+
writing to the MMIO region. The cheaper writel_relaxed() does not provide
1933+
this guarantee and must not be used here.
19331934

19341935
See the subsection "Kernel I/O barrier effects" for more information on
19351936
relaxed I/O accessors and the Documentation/core-api/dma-api.rst file for

‎Documentation/networking/mptcp-sysctl.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ add_addr_timeout - INTEGER (seconds)
2020
resent to an MPTCP peer that has not acknowledged a previous
2121
ADD_ADDR message.
2222

23+
Do not retransmit if set to 0.
24+
2325
The default value matches TCP_RTO_MAX. This is a per-namespace
2426
sysctl.
2527

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 15
4-
SUBLEVEL = 189
4+
SUBLEVEL = 190
55
EXTRAVERSION =
66
NAME = Trick or Treat
77

@@ -1130,7 +1130,7 @@ KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD
11301130
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
11311131

11321132
# userspace programs are linked via the compiler, use the correct linker
1133-
ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy)
1133+
ifdef CONFIG_CC_IS_CLANG
11341134
KBUILD_USERLDFLAGS += $(call cc-option, --ld-path=$(LD))
11351135
endif
11361136

‎arch/alpha/include/asm/processor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
3838
struct task_struct;
3939
extern void release_thread(struct task_struct *);
4040

41-
unsigned long get_wchan(struct task_struct *p);
41+
unsigned long __get_wchan(struct task_struct *p);
4242

4343
#define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc)
4444

‎arch/alpha/kernel/process.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,11 @@ thread_saved_pc(struct task_struct *t)
376376
}
377377

378378
unsigned long
379-
get_wchan(struct task_struct *p)
379+
__get_wchan(struct task_struct *p)
380380
{
381381
unsigned long schedule_frame;
382382
unsigned long pc;
383-
if (!p || p == current || task_is_running(p))
384-
return 0;
383+
385384
/*
386385
* This one depends on the frame size of schedule(). Do a
387386
* "disass schedule" in gdb to find the frame size. Also, the

‎arch/arc/include/asm/processor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ struct task_struct;
7070
extern void start_thread(struct pt_regs * regs, unsigned long pc,
7171
unsigned long usp);
7272

73-
extern unsigned int get_wchan(struct task_struct *p);
73+
extern unsigned int __get_wchan(struct task_struct *p);
7474

7575
#endif /* !__ASSEMBLY__ */
7676

‎arch/arc/kernel/stacktrace.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* = specifics of data structs where trace is saved(CONFIG_STACKTRACE etc)
1616
*
1717
* vineetg: March 2009
18-
* -Implemented correct versions of thread_saved_pc() and get_wchan()
18+
* -Implemented correct versions of thread_saved_pc() and __get_wchan()
1919
*
2020
* rajeshwarr: 2008
2121
* -Initial implementation
@@ -248,7 +248,7 @@ void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)
248248
* Of course just returning schedule( ) would be pointless so unwind until
249249
* the function is not in schedular code
250250
*/
251-
unsigned int get_wchan(struct task_struct *tsk)
251+
unsigned int __get_wchan(struct task_struct *tsk)
252252
{
253253
return arc_unwind_core(tsk, NULL, __get_first_nonsched, NULL);
254254
}

‎arch/arm/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ endif
126126

127127
# Need -Uarm for gcc < 3.x
128128
KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
129-
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
129+
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include $(srctree)/arch/arm/include/asm/unified.h -msoft-float
130130

131131
CHECKFLAGS += -D__arm__
132132

0 commit comments

Comments
 (0)