Commit cb9a830e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-6.7-rc3' of... 

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
  ...
parents 9cf87666 da90e45d

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

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ properties: 
          - qcom,sm8350-ufshc

          - qcom,sm8450-ufshc

          - qcom,sm8550-ufshc

          - qcom,sm8650-ufshc

      - const: qcom,ufshc

      - const: jedec,ufs-2.0
@@ -122,6 +123,7 @@ allOf: 
              - qcom,sm8350-ufshc

              - qcom,sm8450-ufshc

              - qcom,sm8550-ufshc

              - qcom,sm8650-ufshc

    then:

      properties:

        clocks:

MAINTAINERS

+27 −4
Original line number Diff line number Diff line
@@ -8950,7 +8950,6 @@ S: Maintained 
F:	scripts/get_maintainer.pl









GFS2 FILE SYSTEM









M:	Bob Peterson <rpeterso@redhat.com>









M:	Andreas Gruenbacher <agruenba@redhat.com>









L:	gfs2@lists.linux.dev









S:	Supported








@@ -21769,7 +21768,9 @@ F:	Documentation/devicetree/bindings/counter/ti-eqep.yaml







F:	drivers/counter/ti-eqep.c

















TI ETHERNET SWITCH DRIVER (CPSW)









R:	Grygorii Strashko <grygorii.strashko@ti.com>









R:	Siddharth Vadapalli <s-vadapalli@ti.com>









R:	Ravi Gunasekaran <r-gunasekaran@ti.com>









R:	Roger Quadros <rogerq@kernel.org>









L:	linux-omap@vger.kernel.org









L:	netdev@vger.kernel.org









S:	Maintained








@@ -21793,6 +21794,15 @@ F:	Documentation/devicetree/bindings/media/i2c/ti,ds90*







F:	drivers/media/i2c/ds90*









F:	include/media/i2c/ds90*

















TI ICSSG ETHERNET DRIVER (ICSSG)









R:	MD Danish Anwar <danishanwar@ti.com>









R:	Roger Quadros <rogerq@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/ti,icss*.yaml









F:	drivers/net/ethernet/ti/icssg/*

















TI J721E CSI2RX DRIVER









M:	Jai Luthra <j-luthra@ti.com>









L:	linux-media@vger.kernel.org








@@ -23692,6 +23702,20 @@ F:	arch/x86/kernel/dumpstack.c







F:	arch/x86/kernel/stacktrace.c









F:	arch/x86/kernel/unwind_*.c

















X86 TRUST DOMAIN EXTENSIONS (TDX)









M:	Kirill A. Shutemov <kirill.shutemov@linux.intel.com>









R:	Dave Hansen <dave.hansen@linux.intel.com>









L:	x86@kernel.org









L:	linux-coco@lists.linux.dev









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/tdx









F:	arch/x86/boot/compressed/tdx*









F:	arch/x86/coco/tdx/









F:	arch/x86/include/asm/shared/tdx.h









F:	arch/x86/include/asm/tdx.h









F:	arch/x86/virt/vmx/tdx/









F:	drivers/virt/coco/tdx-guest

















X86 VDSO









M:	Andy Lutomirski <luto@kernel.org>









L:	linux-kernel@vger.kernel.org








@@ -23872,8 +23896,7 @@ T:	git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git







P:	Documentation/filesystems/xfs-maintainer-entry-profile.rst









F:	Documentation/ABI/testing/sysfs-fs-xfs









F:	Documentation/admin-guide/xfs.rst









F:	Documentation/filesystems/xfs-delayed-logging-design.rst









F:	Documentation/filesystems/xfs-self-describing-metadata.rst









F:	Documentation/filesystems/xfs-*









F:	fs/xfs/









F:	include/uapi/linux/dqblk_xfs.h









F:	include/uapi/linux/fsmap.h

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 7









SUBLEVEL = 0









EXTRAVERSION = -rc1









EXTRAVERSION = -rc2









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*
































arch/parisc/Kconfig



+3
−3






























Original line number
Diff line number
Diff line







@@ -140,11 +140,11 @@ config ARCH_MMAP_RND_COMPAT_BITS_MIN







	default 8



















config ARCH_MMAP_RND_BITS_MAX









	default 24 if 64BIT









	default 17









	default 18 if 64BIT









	default 13



















config ARCH_MMAP_RND_COMPAT_BITS_MAX









	default 17









	default 13



















# unless you want to implement ACPI on PA-RISC ... ;-)









config PM
































arch/parisc/include/asm/elf.h



+1
−9






























Original line number
Diff line number
Diff line







@@ -349,15 +349,7 @@ struct pt_regs;	/* forward declaration... */

















#define ELF_HWCAP	0



















/* Masks for stack and mmap randomization */









#define BRK_RND_MASK	(is_32bit_task() ? 0x07ffUL : 0x3ffffUL)









#define MMAP_RND_MASK	(is_32bit_task() ? 0x1fffUL : 0x3ffffUL)









#define STACK_RND_MASK	MMAP_RND_MASK



















struct mm_struct;









extern unsigned long arch_randomize_brk(struct mm_struct *);









#define arch_randomize_brk arch_randomize_brk



















#define STACK_RND_MASK	0x7ff	/* 8MB of VA */



















#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1









struct linux_binprm;