Skip to content
  1. Jul 07, 2023
    • Linus Torvalds's avatar
      Merge tag 'acpi-6.5-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 94e0d43e
      Linus Torvalds authored
      Pull more ACPI updates from Rafael Wysocki:
       "These fix a couple of compiler warnings, refine an ACPI device
        enumeration quirk to address a driver regression and clean up code.
      
        Specifics:
      
         - Make acpi_companion_match() return a const pointer and update its
           callers accordingly (Andy Shevchenko)
      
         - Move the extern declaration of the acpi_root variable to a header
           file so as to address a compiler warning (Andy Shevchenko)
      
         - Address compiler warnings in the ACPI device enumeration code by
           adding a missing header file include to it (Ben Dooks)
      
         - Refine the SMB0001 quirk in the ACPI device enumeration code so as
           to address an i2c-scmi driver regression (Andy Shevchenko)
      
         - Clean up two pieces of the ACPI device enumeration code (Andy
           Shevchenko)"
      
      * tag 'acpi-6.5-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: scan: Use the acpi_match_acpi_device() helper
        ACPI: platform: Move SMB0001 HID to the header and reuse
        ACPI: platform: Ignore SMB0001 only when it has resources
        ACPI: bus: Introduce acpi_match_acpi_device() helper
        ACPI: scan: fix undeclared variable warnings by including sleep.h
        ACPI: bus: Constify acpi_companion_match() returned value
        ACPI: scan: Move acpi_root to internal header
      94e0d43e
    • Linus Torvalds's avatar
      Merge tag 'docs-6.5-2' of git://git.lwn.net/linux · 7210de3a
      Linus Torvalds authored
      Pull mode documentation updates from Jonathan Corbet:
       "A half-dozen late arriving docs patches. They are mostly fixes, but we
        also have a kernel-doc tweak for enums and the long-overdue removal of
        the outdated and redundant patch-submission comments at the top of the
        MAINTAINERS file"
      
      * tag 'docs-6.5-2' of git://git.lwn.net/linux:
        scripts: kernel-doc: support private / public marking for enums
        Documentation: KVM: SEV: add a missing backtick
        Documentation: ACPI: fix typo in ssdt-overlays.rst
        Fix documentation of panic_on_warn
        docs: remove the tips on how to submit patches from MAINTAINERS
        docs: fix typo in zh_TW and zh_CN translation
      7210de3a
    • Linus Torvalds's avatar
      Merge tag 'spi-fix-v6.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 1793eac1
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A few mostly minor fixes that came in during the merge window, plus
        one administrative update for Jonas' e-mail address.
      
        The spi-geni-qcom fix is more major than the others, fixing the newly
        added DMA support for large reads which trigger DMA"
      
      * tag 'spi-fix-v6.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: bcm{63xx,bca}-hsspi: update my email address
        spi: rzv2m-csi: Fix SoC product name
        spi: bcm-qspi: return error if neither hif_mspi nor mspi is available
        spi: spi-geni-qcom: enable SPI_CONTROLLER_MUST_TX for GPI DMA mode
      1793eac1
    • Linus Torvalds's avatar
      Merge tag 'regulator-fix-v6.5-merge-window' of... · 146d7ce3
      Linus Torvalds authored
      Merge tag 'regulator-fix-v6.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fix from Mark Brown:
       "A simple dependency fix for a newly added driver"
      
      * tag 'regulator-fix-v6.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: raa215300: Add build dependency with COMMON_CLK
      146d7ce3
    • Linus Torvalds's avatar
      Merge tag 'trace-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace · 8066178f
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
      
       - Fix bad git merge of #endif in arm64 code
      
         A merge of the arm64 tree caused #endif to go into the wrong place
      
       - Fix crash on lseek of write access to tracefs/error_log
      
         Opening error_log as write only, and then doing an lseek() causes a
         kernel panic, because the lseek() handle expects a "seq_file" to
         exist (which is not done on write only opens). Use tracing_lseek()
         that tests for this instead of calling the default seq lseek handler.
      
       - Check for negative instead of -E2BIG for error on strscpy() returns
      
         Instead of testing for -E2BIG from strscpy(), to be more robust,
         check for less than zero, which will make sure it catches any error
         that strscpy() may someday return.
      
      * tag 'trace-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
        tracing/boot: Test strscpy() against less than zero for error
        arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n
        tracing: Fix null pointer dereference in tracing_err_log_open()
      8066178f
    • Linus Torvalds's avatar
      Merge tag 'v6.5/vfs.fixes.2' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs · 7fdeb23f
      Linus Torvalds authored
      Pull vfs fixes from Christian Brauner:
       "This contains two minor fixes for Jan's rename locking work:
      
         - Unlocking the source inode was guarded by a check whether source
           was non-NULL. This doesn't make sense because source must be
           non-NULL and the commit message explains in detail why
      
         - The lock_two_nondirectories() helper called WARN_ON_ONCE() and
           dereferenced the inodes unconditionally but the underlying
           lock_two_inodes() helper and the kernel documentation for that
           function are clear that it is valid to pass NULL arguments, so a
           non-NULL check is needed. No callers currently pass NULL arguments
           but let's not knowingly leave landmines around"
      
      * tag 'v6.5/vfs.fixes.2' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
        fs: don't assume arguments are non-NULL
        fs: no need to check source
      7fdeb23f
    • Linus Torvalds's avatar
      Merge tag 's390-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · a4524835
      Linus Torvalds authored
      Pull more s390 updates from Alexander Gordeev:
      
       - Fix virtual vs physical address confusion in vmem_add_range() and
         vmem_remove_range() functions
      
       - Include <linux/io.h> instead of <asm/io.h> and <asm-generic/io.h>
         throughout s390 code
      
       - Make all PSW related defines also available for assembler files.
         Remove PSW_DEFAULT_KEY define from uapi for that
      
       - When adding an undefined symbol the build still succeeds, but
         userspace crashes trying to execute VDSO, because the symbol is not
         resolved. Add undefined symbols check to prevent that
      
       - Use kvmalloc_array() instead of kzalloc() for allocaton of 256k
         memory when executing s390 crypto adapter IOCTL
      
       - Add -fPIE flag to prevent decompressor misaligned symbol build error
         with clang
      
       - Use .balign instead of .align everywhere. This is a no-op for s390,
         but with this there no mix in using .align and .balign anymore
      
       - Filter out -mno-pic-data-is-text-relative flag when compiling kernel
         to prevent VDSO build error
      
       - Rework entering of DAT-on mode on CPU restart to use PSW_KERNEL_BITS
         mask directly
      
       - Do not retry administrative requests to some s390 crypto cards, since
         the firmware assumes replay attacks
      
       - Remove most of the debug code, which is build in when kernel config
         option CONFIG_ZCRYPT_DEBUG is enabled
      
       - Remove CONFIG_ZCRYPT_MULTIDEVNODES kernel config option and switch
         off the multiple devices support for the s390 zcrypt device driver
      
       - With the conversion to generic entry machine checks are accounted to
         the current context instead of irq time. As result, the STCKF
         instruction at the beginning of the machine check handler and the
         lowcore member are no longer required, therefore remove it
      
       - Fix various typos found with codespell
      
       - Minor cleanups to CPU-measurement Counter and Sampling Facilities
         code
      
       - Revert patch that removes VMEM_MAX_PHYS macro, since it causes a
         regression
      
      * tag 's390-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (25 commits)
        Revert "s390/mm: get rid of VMEM_MAX_PHYS macro"
        s390/cpum_sf: remove check on CPU being online
        s390/cpum_sf: handle casts consistently
        s390/cpum_sf: remove unnecessary debug statement
        s390/cpum_sf: remove parameter in call to pr_err
        s390/cpum_sf: simplify function setup_pmu_cpu
        s390/cpum_cf: remove unneeded debug statements
        s390/entry: remove mcck clock
        s390: fix various typos
        s390/zcrypt: remove ZCRYPT_MULTIDEVNODES kernel config option
        s390/zcrypt: do not retry administrative requests
        s390/zcrypt: cleanup some debug code
        s390/entry: rework entering DAT-on mode on CPU restart
        s390/mm: fence off VM macros from asm and linker
        s390: include linux/io.h instead of asm/io.h
        s390/ptrace: make all psw related defines also available for asm
        s390/ptrace: remove PSW_DEFAULT_KEY from uapi
        s390/vdso: filter out mno-pic-data-is-text-relative cflag
        s390: consistently use .balign instead of .align
        s390/decompressor: fix misaligned symbol build error
        ...
      a4524835
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-bus' and 'acpi-scan' · 2e178ee1
      Rafael J. Wysocki authored
      Merge additional ACPI device enumeration code changes for 6.5-rc1.
      
       - Make acpi_companion_match() return a const pointer and update its
         callers accordingly (Andy Shevchenko).
      
       - Move the extern declaration of the acpi_root variable to a header
         file so as to address a compiler warning (Andy Shevchenko).
      
       - Address compiler warnings in the ACPI device enumeration code by
         adding a missing header file include to it (Ben Dooks).
      
       - Refine the SMB0001 quirk in the ACPI device enumeration code so as to
         address an i2c-scmi driver regression (Andy Shevchenko).
      
       - Clean up two pieces of the ACPI device enumeration code (Andy
         Shevchenko).
      
      * acpi-bus:
        ACPI: bus: Constify acpi_companion_match() returned value
      
      * acpi-scan:
        ACPI: scan: Use the acpi_match_acpi_device() helper
        ACPI: platform: Move SMB0001 HID to the header and reuse
        ACPI: platform: Ignore SMB0001 only when it has resources
        ACPI: bus: Introduce acpi_match_acpi_device() helper
        ACPI: scan: fix undeclared variable warnings by including sleep.h
        ACPI: scan: Move acpi_root to internal header
      2e178ee1
    • Linus Torvalds's avatar
      Merge tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · 7b82e904
      Linus Torvalds authored
      Pull asm-generic updates from Arnd Bergmann:
       "These are cleanups for architecture specific header files:
      
         - the comments in include/linux/syscalls.h have gone out of sync and
           are really pointless, so these get removed
      
         - The asm/bitsperlong.h header no longer needs to be architecture
           specific on modern compilers, so use a generic version for newer
           architectures that use new enough userspace compilers
      
         - A cleanup for virt_to_pfn/virt_to_bus to have proper type checking,
           forcing the use of pointers"
      
      * tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        syscalls: Remove file path comments from headers
        tools arch: Remove uapi bitsperlong.h of hexagon and microblaze
        asm-generic: Unify uapi bitsperlong.h for arm64, riscv and loongarch
        m68k/mm: Make pfn accessors static inlines
        arm64: memory: Make virt_to_pfn() a static inline
        ARM: mm: Make virt_to_pfn() a static inline
        asm-generic/page.h: Make pfn accessors static inlines
        xen/netback: Pass (void *) to virt_to_page()
        netfs: Pass a pointer to virt_to_page()
        cifs: Pass a pointer to virt_to_page() in cifsglob
        cifs: Pass a pointer to virt_to_page()
        riscv: mm: init: Pass a pointer to virt_to_page()
        ARC: init: Pass a pointer to virt_to_pfn() in init
        m68k: Pass a pointer to virt_to_pfn() virt_to_page()
        fs/proc/kcore.c: Pass a pointer to virt_addr_valid()
      7b82e904
    • Linus Torvalds's avatar
      Merge tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 9f57c13f
      Linus Torvalds authored
      Pull SoC fixes from Arnd Bergmann:
       "There are three small fixes that came up sincie the past week:
      
         - an incorrect bit offset in ixp4xx bus driver
      
         - a riscv randconfig regression in the thead platform I merged
      
         - whitespace fixes for some dts files"
      
      * tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
        bus: ixp4xx: fix IXP4XX_EXP_T1_MASK
        ARM: dts: st: add missing space before {
        RISC-V: make ARCH_THEAD preclude XIP_KERNEL
      9f57c13f
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine · 0b907305
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "New support:
         - TI J721S2 CSI BCDMA support
      
        Updates:
         - Native HDMI support for dw edma driver
         - ste dma40 updates for supporting proper SRAM handle in DT
         - removal of dma device chancnt setting in drivers"
      
      * tag 'dmaengine-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (28 commits)
        dmaengine: sprd: Don't set chancnt
        dmaengine: hidma: Don't set chancnt
        dmaengine: plx_dma: Don't set chancnt
        dmaengine: axi-dmac: Don't set chancnt
        dmaengine: dw-axi-dmac: Don't set chancnt
        dmaengine: qcom: bam_dma: allow omitting num-{channels,ees}
        dmaengine: dw-edma: Add HDMA DebugFS support
        dmaengine: dw-edma: Add support for native HDMA
        dmaengine: dw-edma: Create a new dw_edma_core_ops structure to abstract controller operation
        dmaengine: dw-edma: Rename dw_edma_core_ops structure to dw_edma_plat_ops
        dmaengine: ste_dma40: use proper format string for resource_size_t
        dmaengine: make QCOM_HIDMA depend on HAS_IOMEM
        dmaengine: ste_dma40: fix typo in enum documentation
        dmaengine: ste_dma40: use correct print specfier for resource_size_t
        MAINTAINERS: Add myself as the DW eDMA driver reviewer
        MAINTAINERS: Add Manivannan to DW eDMA driver maintainers list
        MAINTAINERS: Demote Gustavo Pimentel to DW EDMA driver reviewer
        dmaengine: ti: k3-udma: Add support for J721S2 CSI BCDMA instance
        dt-bindings: dma: ti: Add J721S2 BCDMA
        dmaengine: ti: k3-psil-j721s2: Add PSI-L thread map for main CPSW2G
        ...
      0b907305
    • Linus Torvalds's avatar
      Merge tag 'linux-watchdog-6.5-rc1' of git://www.linux-watchdog.org/linux-watchdog · c91e587b
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
      
       - add Xilinx Versal watchdog
      
       - support Hygon FCH/SCH (Server Controller Hub)
      
       - convert GPL notices to SPDX identifiers
      
       - other improvements
      
      * tag 'linux-watchdog-6.5-rc1' of git://www.linux-watchdog.org/linux-watchdog:
        watchdog: sp5100_tco: support Hygon FCH/SCH (Server Controller Hub)
        dt-bindings: watchdog: restrict node name suffixes
        MAINTAINERS: Add support for Xilinx versal watchdog
        watchdog: xilinx_wwdt: Add Versal window watchdog support
        dt-bindings: watchdog: xlnx,versal-wwdt: Add versal watchdog
        watchdog: ziirave_wdt: Switch i2c driver back to use .probe()
        watchdog: ibmasr: Replace GPL license notice with SPDX identifier
        watchdog: Convert GPL 2.0 notice to SPDX identifier
        watchdog: loongson1_wdt: Add DT support
      c91e587b
  2. Jul 06, 2023
  3. Jul 05, 2023