Skip to content
  1. Apr 01, 2022
    • Linus Torvalds's avatar
      Merge tag 'linux-watchdog-5.18-rc1' of git://www.linux-watchdog.org/linux-watchdog · 354b8bf2
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
      
       - add support for BCM4908
      
       - renesas_wdt: add R-Car Gen4 support
      
       - improve watchdog_dev function documentation
      
       - sp5100_tco: replace the cd6h/cd7h port I/O with MMIO accesses during
         initialization
      
       - several other small improvements and fixes
      
      * tag 'linux-watchdog-5.18-rc1' of git://www.linux-watchdog.org/linux-watchdog:
        Watchdog: sp5100_tco: Enable Family 17h+ CPUs
        Watchdog: sp5100_tco: Add initialization using EFCH MMIO
        Watchdog: sp5100_tco: Refactor MMIO base address initialization
        Watchdog: sp5100_tco: Move timer initialization into function
        watchdog: ixp4xx: Implement restart
        watchdog: orion_wdt: support pretimeout on Armada-XP
        watchdog: allow building BCM7038_WDT for BCM4908
        watchdog: renesas_wdt: Add R-Car Gen4 support
        dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support
        watchdog: Improve watchdog_dev function documentation
        watchdog: aspeed: add nowayout support
        watchdog: rti-wdt: Add missing pm_runtime_disable() in probe function
        watchdog: imx2_wdg: Alow ping on suspend
      354b8bf2
    • Linus Torvalds's avatar
      Merge tag 'auxdisplay-for-linus-v5.18-rc1' of https://github.com/ojeda/linux · d4f1db77
      Linus Torvalds authored
      Pull auxdisplay updates from Miguel Ojeda:
       "A few auxdisplay lcd2s improvements from Andy Shevchenko"
      
      * tag 'auxdisplay-for-linus-v5.18-rc1' of https://github.com/ojeda/linux:
        auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()
        auxdisplay: lcd2s: Switch to i2c ->probe_new()
        auxdisplay: lcd2s: use module_i2c_driver to simplify the code
        auxdisplay: lcd2s: make use of device property API
        auxdisplay: lcd2s: Fix multi-line comment style
      d4f1db77
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · f4f5d7cf
      Linus Torvalds authored
      Pull virtio updates from Michael Tsirkin:
      
       - vdpa generic device type support
      
       - more virtio hardening for broken devices (but on the same theme,
         revert some virtio hotplug hardening patches - they were misusing
         some interrupt flags and had to be reverted)
      
       - RSS support in virtio-net
      
       - max device MTU support in mlx5 vdpa
      
       - akcipher support in virtio-crypto
      
       - shared IRQ support in ifcvf vdpa
      
       - a minor performance improvement in vhost
      
       - enable virtio mem for ARM64
      
       - beginnings of advance dma support
      
       - cleanups, fixes all over the place
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (33 commits)
        vdpa/mlx5: Avoid processing works if workqueue was destroyed
        vhost: handle error while adding split ranges to iotlb
        vdpa: support exposing the count of vqs to userspace
        vdpa: change the type of nvqs to u32
        vdpa: support exposing the config size to userspace
        vdpa/mlx5: re-create forwarding rules after mac modified
        virtio: pci: check bar values read from virtio config space
        Revert "virtio_pci: harden MSI-X interrupts"
        Revert "virtio-pci: harden INTX interrupts"
        drivers/net/virtio_net: Added RSS hash report control.
        drivers/net/virtio_net: Added RSS hash report.
        drivers/net/virtio_net: Added basic RSS support.
        drivers/net/virtio_net: Fixed padded vheader to use v1 with hash.
        virtio: use virtio_device_ready() in virtio_device_restore()
        tools/virtio: compile with -pthread
        tools/virtio: fix after premapped buf support
        virtio_ring: remove flags check for unmap packed indirect desc
        virtio_ring: remove flags check for unmap split indirect desc
        virtio_ring: rename vring_unmap_state_packed() to vring_unmap_extra_packed()
        net/mlx5: Add support for configuring max device MTU
        ...
      f4f5d7cf
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · e729dbe8
      Linus Torvalds authored
      Pull more ACPI updates from Rafael Wysocki:
       "These are fixes and cleanup on top of the previously merged ACPI
        material.
      
        Specifics:
      
         - Avoid out-of-bounds access when parsing _CPC data (Rafael Wysocki)
      
         - Change default error code and clean up debug messages in ACPI CPPC
           probe (Rafael Wysocki)
      
         - Replace usage of found with dedicated list iterator variable in the
           ACPI IPMI driver (Jakob Koschel)
      
         - Clean up variable name confusion in APEI (Jakob Koschel)
      
         - Make LAPIC_ADDR_OVR address readable in a message parsed during
           MADT parsing (Vasant Hegde)"
      
      * tag 'acpi-5.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: CPPC: Change default error code and clean up debug messages in probe
        ACPI: CPPC: Avoid out of bounds access when parsing _CPC data
        ACPI: tables: Make LAPIC_ADDR_OVR address readable in message
        ACPI: IPMI: replace usage of found with dedicated list iterator variable
        ACPI, APEI: Use the correct variable for sizeof()
      e729dbe8
    • Linus Torvalds's avatar
      Merge tag 'docs-5.18-2' of git://git.lwn.net/linux · b4a5ea09
      Linus Torvalds authored
      Pull more documentation updates from Jonathan Corbet:
       "Some late-arriving documentation improvements.
      
        This is mostly build-system fixes from Mauro and Akira; I also took
        the liberty of dropping in my 'messy diffstat' document"
      
      * tag 'docs-5.18-2' of git://git.lwn.net/linux:
        docs: Add a document on how to fix a messy diffstat
        docs: sphinx/requirements: Limit jinja2<3.1
        Documentation: kunit: Fix cross-referencing warnings
        scripts/kernel-doc: change the line number meta info
        scripts/get_abi: change the file/line number meta info
        docs: kernel_include.py: add sphinx build dependencies
        docs: kernel_abi.py: add sphinx build dependencies
        docs: kernel_feat.py: add build dependencies
        scripts/get_feat.pl: allow output the parsed file names
        docs: kfigure.py: Don't warn of missing PDF converter in 'make htmldocs'
        Documentation: Fix duplicate statement about raw_spinlock_t type
      b4a5ea09
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v5.18-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · b8321ed4
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - Add new environment variables, USERCFLAGS and USERLDFLAGS to allow
         additional flags to be passed to user-space programs.
      
       - Fix missing fflush() bugs in Kconfig and fixdep
      
       - Fix a minor bug in the comment format of the .config file
      
       - Make kallsyms ignore llvm's local labels, .L*
      
       - Fix UAPI compile-test for cross-compiling with Clang
      
       - Extend the LLVM= syntax to support LLVM=<suffix> form for using a
         particular version of LLVm, and LLVM=<prefix> form for using custom
         LLVM in a particular directory path.
      
       - Clean up Makefiles
      
      * tag 'kbuild-v5.18-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: Make $(LLVM) more flexible
        kbuild: add --target to correctly cross-compile UAPI headers with Clang
        fixdep: use fflush() and ferror() to ensure successful write to files
        arch: syscalls: simplify uapi/kapi directo...
      b8321ed4
    • Linus Torvalds's avatar
      Merge tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · f87cbd05
      Linus Torvalds authored
      Pull hardening updates from Kees Cook:
       "This addresses an -Warray-bounds warning found under a few ARM
        defconfigs, and disables long-broken HARDENED_USERCOPY_PAGESPAN"
      
      * tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        ARM/dma-mapping: Remove CMA code when not built with CMA
        usercopy: Disable CONFIG_HARDENED_USERCOPY_PAGESPAN
      f87cbd05
    • Linus Torvalds's avatar
      Merge tag 'net-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 2975dbdc
      Linus Torvalds authored
      Pull more networking updates from Jakub Kicinski:
       "Networking fixes and rethook patches.
      
        Features:
      
         - kprobes: rethook: x86: replace kretprobe trampoline with rethook
      
        Current release - regressions:
      
         - sfc: avoid null-deref on systems without NUMA awareness in the new
           queue sizing code
      
        Current release - new code bugs:
      
         - vxlan: do not feed vxlan_vnifilter_dump_dev with non-vxlan devices
      
         - eth: lan966x: fix null-deref on PHY pointer in timestamp ioctl when
           interface is down
      
        Previous releases - always broken:
      
         - openvswitch: correct neighbor discovery target mask field in the
           flow dump
      
         - wireguard: ignore v6 endpoints when ipv6 is disabled and fix a leak
      
         - rxrpc: fix call timer start racing with call destruction
      
         - rxrpc: fix null-deref when security type is rxrpc_no_security
      
         - can: fix UAF bugs around echo skbs in multiple drivers
      
        Misc:
      
         - docs: move netdev-FAQ to the 'process' section of the
           documentation"
      
      * tag 'net-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (57 commits)
        vxlan: do not feed vxlan_vnifilter_dump_dev with non vxlan devices
        openvswitch: Add recirc_id to recirc warning
        rxrpc: fix some null-ptr-deref bugs in server_key.c
        rxrpc: Fix call timer start racing with call destruction
        net: hns3: fix software vlan talbe of vlan 0 inconsistent with hardware
        net: hns3: fix the concurrency between functions reading debugfs
        docs: netdev: move the netdev-FAQ to the process pages
        docs: netdev: broaden the new vs old code formatting guidelines
        docs: netdev: call out the merge window in tag checking
        docs: netdev: add missing back ticks
        docs: netdev: make the testing requirement more stringent
        docs: netdev: add a question about re-posting frequency
        docs: netdev: rephrase the 'should I update patchwork' question
        docs: netdev: rephrase the 'Under review' question
        docs: netdev: shorten the name and mention msgid for patch status
        docs: netdev: note that RFC postings are allowed any time
        docs: netdev: turn the net-next closed into a Warning
        docs: netdev: move the patch marking section up
        docs: netdev: minor reword
        docs: netdev: replace references to old archives
        ...
      2975dbdc
    • Kees Cook's avatar
      ARM/dma-mapping: Remove CMA code when not built with CMA · 229a08a4
      Kees Cook authored
      The MAX_CMA_AREAS could be set to 0, which would result in code that would
      attempt to operate beyond the end of a zero-sized array. If CONFIG_CMA
      is disabled, just remove this code entirely. Found when building arm
      on GCC 10.x for several defconfigs (e.g. axm55xx_defconfig) under
      -Warray-bounds:
      
      arch/arm/mm/dma-mapping.c:396:22: warning: array subscript <unknown> is outside array bounds of 'struct dma_contig_early_reserve[0]' [-Warray-bounds]
        396 |         dma_mmu_remap[dma_mmu_remap_num].size = size;
            |         ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
      arch/arm/mm/dma-mapping.c:389:40: note: while referencing 'dma_mmu_remap'
        389 | static struct dma_contig_early_reserve dma_mmu_remap[MAX_CMA_AREAS] __initdata;
            |                                        ^~~~~~~~~~~~~
      
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Logan Gunthorpe <logang@deltatee.com>
      Cc: Martin Oliveira <martin.oliveira@eideticom.com>
      Cc: David Hildenbrand <david@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: Zi Yan <ziy@nvidia.com>
      Cc: Hari Bathini <hbathini@linux.ibm.com>
      Cc: Minchan Kim <minchan@kernel.org>
      Cc: Mike Kravetz <mike.kravetz@oracle.com>
      Cc: linux-arm-kernel@lists.infradead.org
      Link: https://lore.kernel.org/all/6243ee60.1c69fb81.16de6.7dbf@mx.google.com/
      
      
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Link: https://lore.kernel.org/lkml/20220310070041.GA24874@lst.de
      
      
      Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
      Link: https://lore.kernel.org/lkml/9059fa71-330f-f04f-b155-2850abb72a71@redhat.com
      229a08a4
    • Linus Torvalds's avatar
      Merge tag 'v5.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 93235e3d
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
      
       - Missing Kconfig dependency on arm that leads to boot failure
      
       - x86 SLS fixes
      
       - Reference leak in the stm32 driver
      
      * tag 'v5.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: x86/sm3 - Fixup SLS
        crypto: x86/poly1305 - Fixup SLS
        crypto: x86/chacha20 - Avoid spurious jumps to other functions
        crypto: stm32 - fix reference leak in stm32_crc_remove
        crypto: arm/aes-neonbs-cbc - Select generic cbc and aes
      93235e3d
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-ipmi', 'acpi-tables' and 'acpi-apei' · 4a13e559
      Rafael J. Wysocki authored
      Merge IMPI driver changes, ACPI tables parsing code changes and
      additional APEI changes for v5.18-rc1:
      
       - Replace usage of found with dedicated list iterator variable
         in the ACPI IPMI driver (Jakob Koschel).
      
       - Make LAPIC_ADDR_OVR address readable in a message parsed during
         MADT parsing (Vasant Hegde).
      
       - Clean up variable name confusion in APEI (Jakob Koschel).
      
      * acpi-ipmi:
        ACPI: IPMI: replace usage of found with dedicated list iterator variable
      
      * acpi-tables:
        ACPI: tables: Make LAPIC_ADDR_OVR address readable in message
      
      * acpi-apei:
        ACPI, APEI: Use the correct variable for sizeof()
      4a13e559
  2. Mar 31, 2022