Skip to content

Commit cb9a830

Browse files
committed
Merge tag 'usb-serial-6.7-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for 6.7-rc3 Here are a couple of modem device entry fixes and some new modem device ids. All have been in linux-next with no reported issues. * tag 'usb-serial-6.7-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: (329 commits) USB: serial: option: add Luat Air72*U series products USB: serial: option: add Fibocom L7xx modules USB: serial: option: fix FM101R-GL defines USB: serial: option: don't claim interface 4 for ZTE MF290 Linux 6.7-rc2 prctl: Disable prctl(PR_SET_MDWE) on parisc parisc/power: Fix power soft-off when running on qemu parisc: Replace strlcpy() with strscpy() NFSD: Fix checksum mismatches in the duplicate reply cache NFSD: Fix "start of NFS reply" pointer passed to nfsd_cache_update() NFSD: Update nfsd_cache_append() to use xdr_stream nfsd: fix file memleak on client_opens_release dm-crypt: start allocating with MAX_ORDER dm-verity: don't use blocking calls from tasklets dm-bufio: fix no-sleep mode dm-delay: avoid duplicate logic dm-delay: fix bugs introduced by kthread mode dm-delay: fix a race between delay_presuspend and delay_bio drm/amdgpu/gmc9: disable AGP aperture drm/amdgpu/gmc10: disable AGP aperture ...
2 parents 9cf8766 + da90e45 commit cb9a830

File tree

251 files changed

+4099
-3357
lines changed

Some content is hidden

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

251 files changed

+4099
-3357
lines changed

Documentation/arch/x86/boot.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Protocol 2.14 BURNT BY INCORRECT COMMIT
7777
Protocol 2.15 (Kernel 5.5) Added the kernel_info and kernel_info.setup_type_max.
7878
============= ============================================================
7979

80-
.. note::
80+
.. note::
8181
The protocol version number should be changed only if the setup header
8282
is changed. There is no need to update the version number if boot_params
8383
or kernel_info are changed. Additionally, it is recommended to use

Documentation/devicetree/bindings/net/ethernet-controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,12 @@ allOf:
275275
properties:
276276
rx-internal-delay-ps:
277277
description:
278-
RGMII Receive Clock Delay defined in pico seconds.This is used for
278+
RGMII Receive Clock Delay defined in pico seconds. This is used for
279279
controllers that have configurable RX internal delays. If this
280280
property is present then the MAC applies the RX delay.
281281
tx-internal-delay-ps:
282282
description:
283-
RGMII Transmit Clock Delay defined in pico seconds.This is used for
283+
RGMII Transmit Clock Delay defined in pico seconds. This is used for
284284
controllers that have configurable TX internal delays. If this
285285
property is present then the MAC applies the TX delay.
286286

Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ properties:
3636
- qcom,sm8350-ufshc
3737
- qcom,sm8450-ufshc
3838
- qcom,sm8550-ufshc
39+
- qcom,sm8650-ufshc
3940
- const: qcom,ufshc
4041
- const: jedec,ufs-2.0
4142

@@ -122,6 +123,7 @@ allOf:
122123
- qcom,sm8350-ufshc
123124
- qcom,sm8450-ufshc
124125
- qcom,sm8550-ufshc
126+
- qcom,sm8650-ufshc
125127
then:
126128
properties:
127129
clocks:

MAINTAINERS

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8950,7 +8950,6 @@ S: Maintained
89508950
F: scripts/get_maintainer.pl
89518951

89528952
GFS2 FILE SYSTEM
8953-
M: Bob Peterson <[email protected]>
89548953
M: Andreas Gruenbacher <[email protected]>
89558954
89568955
S: Supported
@@ -21769,7 +21768,9 @@ F: Documentation/devicetree/bindings/counter/ti-eqep.yaml
2176921768
F: drivers/counter/ti-eqep.c
2177021769

2177121770
TI ETHERNET SWITCH DRIVER (CPSW)
21772-
R: Grygorii Strashko <[email protected]>
21771+
R: Siddharth Vadapalli <[email protected]>
21772+
R: Ravi Gunasekaran <[email protected]>
21773+
R: Roger Quadros <[email protected]>
2177321774
2177421775
2177521776
S: Maintained
@@ -21793,6 +21794,15 @@ F: Documentation/devicetree/bindings/media/i2c/ti,ds90*
2179321794
F: drivers/media/i2c/ds90*
2179421795
F: include/media/i2c/ds90*
2179521796

21797+
TI ICSSG ETHERNET DRIVER (ICSSG)
21798+
R: MD Danish Anwar <[email protected]>
21799+
R: Roger Quadros <[email protected]>
21800+
L: [email protected] (moderated for non-subscribers)
21801+
21802+
S: Maintained
21803+
F: Documentation/devicetree/bindings/net/ti,icss*.yaml
21804+
F: drivers/net/ethernet/ti/icssg/*
21805+
2179621806
TI J721E CSI2RX DRIVER
2179721807
M: Jai Luthra <[email protected]>
2179821808
@@ -23692,6 +23702,20 @@ F: arch/x86/kernel/dumpstack.c
2369223702
F: arch/x86/kernel/stacktrace.c
2369323703
F: arch/x86/kernel/unwind_*.c
2369423704

23705+
X86 TRUST DOMAIN EXTENSIONS (TDX)
23706+
M: Kirill A. Shutemov <[email protected]>
23707+
R: Dave Hansen <[email protected]>
23708+
23709+
23710+
S: Supported
23711+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/tdx
23712+
F: arch/x86/boot/compressed/tdx*
23713+
F: arch/x86/coco/tdx/
23714+
F: arch/x86/include/asm/shared/tdx.h
23715+
F: arch/x86/include/asm/tdx.h
23716+
F: arch/x86/virt/vmx/tdx/
23717+
F: drivers/virt/coco/tdx-guest
23718+
2369523719
X86 VDSO
2369623720
M: Andy Lutomirski <[email protected]>
2369723721
@@ -23872,8 +23896,7 @@ T: git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
2387223896
P: Documentation/filesystems/xfs-maintainer-entry-profile.rst
2387323897
F: Documentation/ABI/testing/sysfs-fs-xfs
2387423898
F: Documentation/admin-guide/xfs.rst
23875-
F: Documentation/filesystems/xfs-delayed-logging-design.rst
23876-
F: Documentation/filesystems/xfs-self-describing-metadata.rst
23899+
F: Documentation/filesystems/xfs-*
2387723900
F: fs/xfs/
2387823901
F: include/uapi/linux/dqblk_xfs.h
2387923902
F: include/uapi/linux/fsmap.h

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 7
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

arch/parisc/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ config ARCH_MMAP_RND_COMPAT_BITS_MIN
140140
default 8
141141

142142
config ARCH_MMAP_RND_BITS_MAX
143-
default 24 if 64BIT
144-
default 17
143+
default 18 if 64BIT
144+
default 13
145145

146146
config ARCH_MMAP_RND_COMPAT_BITS_MAX
147-
default 17
147+
default 13
148148

149149
# unless you want to implement ACPI on PA-RISC ... ;-)
150150
config PM

arch/parisc/include/asm/elf.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -349,15 +349,7 @@ struct pt_regs; /* forward declaration... */
349349

350350
#define ELF_HWCAP 0
351351

352-
/* Masks for stack and mmap randomization */
353-
#define BRK_RND_MASK (is_32bit_task() ? 0x07ffUL : 0x3ffffUL)
354-
#define MMAP_RND_MASK (is_32bit_task() ? 0x1fffUL : 0x3ffffUL)
355-
#define STACK_RND_MASK MMAP_RND_MASK
356-
357-
struct mm_struct;
358-
extern unsigned long arch_randomize_brk(struct mm_struct *);
359-
#define arch_randomize_brk arch_randomize_brk
360-
352+
#define STACK_RND_MASK 0x7ff /* 8MB of VA */
361353

362354
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
363355
struct linux_binprm;

arch/parisc/include/asm/processor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747

4848
#ifndef __ASSEMBLY__
4949

50+
struct rlimit;
51+
unsigned long mmap_upper_limit(struct rlimit *rlim_stack);
5052
unsigned long calc_max_stack_size(unsigned long stack_max);
5153

5254
/*

arch/parisc/kernel/processor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ show_cpuinfo (struct seq_file *m, void *v)
383383
char cpu_name[60], *p;
384384

385385
/* strip PA path from CPU name to not confuse lscpu */
386-
strlcpy(cpu_name, per_cpu(cpu_data, 0).dev->name, sizeof(cpu_name));
386+
strscpy(cpu_name, per_cpu(cpu_data, 0).dev->name, sizeof(cpu_name));
387387
p = strrchr(cpu_name, '[');
388388
if (p)
389389
*(--p) = 0;

arch/parisc/kernel/sys_parisc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ unsigned long calc_max_stack_size(unsigned long stack_max)
7777
* indicating that "current" should be used instead of a passed-in
7878
* value from the exec bprm as done with arch_pick_mmap_layout().
7979
*/
80-
static unsigned long mmap_upper_limit(struct rlimit *rlim_stack)
80+
unsigned long mmap_upper_limit(struct rlimit *rlim_stack)
8181
{
8282
unsigned long stack_base;
8383

0 commit comments

Comments
 (0)