1. 11 11月, 2022 4 次提交
    • L
      Merge tag 'for-6.1-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 1767a722
      Linus Torvalds 提交于
      Pull btrfs fixes from David Sterba:
      
       - revert memory optimization for scrub blocks, this misses errors in
         2nd and following blocks
      
       - add exception for ENOMEM as reason for transaction abort to not print
         stack trace, syzbot has reported many
      
       - zoned fixes:
            - fix locking imbalance during scrub
            - initialize zones for seeding device
            - initialize zones for cloned device structures
      
       - when looking up device, change assertion to a real check as some of
         the search parameters can be passed by ioctl, reported by syzbot
      
       - fix error pointer check in self tests
      
      * tag 'for-6.1-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: zoned: fix locking imbalance on scrub
        btrfs: zoned: initialize device's zone info for seeding
        btrfs: zoned: clone zoned device info when cloning a device
        Revert "btrfs: scrub: use larger block size for data extent scrub"
        btrfs: don't print stack trace when transaction is aborted due to ENOMEM
        btrfs: selftests: fix wrong error check in btrfs_free_dummy_root()
        btrfs: fix match incorrectly in dev_args_match_device
      1767a722
    • L
      Merge tag 'soundwire-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire · f014699c
      Linus Torvalds 提交于
      Pull soundwire fixes from Vinod Koul:
       "Two qcom driver fixes for broadcast completion reinit and check for
        outanding writes. And a lone Intel driver fix for clock stop timeout"
      
      * tag 'soundwire-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
        soundwire: qcom: check for outanding writes before doing a read
        soundwire: qcom: reinit broadcast completion
        soundwire: intel: Initialize clock stop timeout
      f014699c
    • L
      Merge tag 'phy-fixes-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy · 8395ee62
      Linus Torvalds 提交于
      Pull phy fixes from Vinod Koul:
       "A bunch of odd driver fixes and a MAINTAINER email update:
      
         - Update Kishon's email
      
         - stms32 error code fix in driver probe
      
         - tegra: fix for checking valid pointer
      
         - qcom_qmp: null deref fix
      
         - sunplus: error check fix
      
         - ralink: add missing sentinel to table"
      
      * tag 'phy-fixes-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
        phy: ralink: mt7621-pci: add sentinel to quirks table
        phy: sunplus: Fix an IS_ERR() vs NULL bug in sp_usb_phy_probe
        phy: qcom-qmp-combo: fix NULL-deref on runtime resume
        phy: tegra: xusb: Fix crash during pad power on/down
        phy: stm32: fix an error code in probe
        MAINTAINERS: Update Kishon's email address in GENERIC PHY FRAMEWORK
      8395ee62
    • L
      Merge tag 'hwlock-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux · 17922865
      Linus Torvalds 提交于
      Pull hwspinlock updates from Bjorn Andersson:
       "I apparently had missed tagging and sending this set of changes out
        during the 6.1 merge window. But did get the associated dts changes
        depending on this merged. The result is a regression in 6.1-rc on the
        affected, older, Qualcomm platforms - in for form of them not booting.
      
        So while these weren't regression fixes originally, they are now. It's
        not introducing new beahavior, but simply extending the existing new
        Devicetree model, to cover remaining platforms:
      
         - extend the DeviceTree binding and implementation for the Qualcomm
           hardware spinlock on some older platforms to follow the style of
           the newer ones where the DeviceTree representation does not rely on
           an intermediate syscon node"
      
      * tag 'hwlock-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
        dt-bindings: hwlock: qcom-hwspinlock: add syscon to MSM8974
        hwspinlock: qcom: add support for MMIO on older SoCs
        hwspinlock: qcom: correct MMIO max register for newer SoCs
        dt-bindings: hwlock: qcom-hwspinlock: correct example indentation
        dt-bindings: hwlock: qcom-hwspinlock: add support for MMIO on older SoCs
      17922865
  2. 10 11月, 2022 1 次提交
    • L
      Merge tag 'slab-for-6.1-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab · f67dd6ce
      Linus Torvalds 提交于
      Pull slab fixes from Vlastimil Babka:
       "Most are small fixups as described below.
      
        The !CONFIG_TRACING fix is a bit bigger and would normally be done in
        the next merge window as part of upcoming hardening changes. But we
        realized it can make the kmalloc waste tracking introduced in this
        window inaccurate, so decided to go with it now.
      
        Summary:
      
         - Remove !CONFIG_TRACING kmalloc() wrappers intended to save a
           function call, due to incompatilibity with recently introduced
           wasted space tracking and planned hardening changes.
      
         - A tracing parameter regression fix, by Kees Cook.
      
         - Two kernel-doc warning fixups, by Lukas Bulwahn and myself
      
      * tag 'slab-for-6.1-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
        mm, slab: remove duplicate kernel-doc comment for ksize()
        mm/slab_common: Restore passing "caller" for tracing
        mm/slab: remove !CONFIG_TRACING variants of kmalloc_[node_]trace()
        mm/slab_common: repair kernel-doc for __ksize()
      f67dd6ce
  3. 09 11月, 2022 2 次提交
    • L
      Merge tag 'audit-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit · f141df37
      Linus Torvalds 提交于
      Pull audit fix from Paul Moore:
       "A small audit patch to fix an instance of undefined behavior in a
        shift operator caused when shifting a signed value too far, the same
        case as the lsm patch merged previously.
      
        While the fix is trivial and I can't imagine it causing a problem in a
        backport, I'm not explicitly marking it for stable on the off chance
        that there is some system out there which is relying on some wonky
        unexpected behavior which this patch could break; *if* it does break,
        IMO it's better that to happen in a minor or -rcX release and not in a
        stable backport"
      
      * tag 'audit-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
        audit: fix undefined behavior in bit shift for AUDIT_BIT
      f141df37
    • L
      Merge tag 'lsm-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm · f49b2d89
      Linus Torvalds 提交于
      Pull lsm fix from Paul Moore:
       "A small capability patch to fix an instance of undefined behavior in a
        shift operator caused when shifting a signed value too far.
      
        While the fix is trivial and I can't imagine it causing a problem in a
        backport, I'm not explicitly marking it for stable on the off chance
        that there is some system out there which is relying on some wonky
        unexpected behavior which this patch could break; *if* it does break,
        IMO it's better that to happen in a minor or -rcX release and not in a
        stable backport"
      
      * tag 'lsm-pr-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
        capabilities: fix undefined behavior in bit shift for CAP_TO_MASK
      f49b2d89
  4. 08 11月, 2022 3 次提交
    • L
      fs/userfaultfd: Fix maple tree iterator in userfaultfd_unregister() · 59f2f4b8
      Liam Howlett 提交于
      When iterating the VMAs, the maple state needs to be invalidated if the
      tree is modified by a split or merge to ensure the maple tree node
      contained in the maple state is still valid.  These invalidations were
      missed, so add them to the paths which alter the tree.
      
      Reported-by: syzbot+0d2014e4da2ccced5b41@syzkaller.appspotmail.com
      Fixes: 69dbe6da (userfaultfd: use maple tree iterator to iterate VMAs)
      Signed-off-by: NLiam R. Howlett <Liam.Howlett@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      59f2f4b8
    • L
      Merge tag 'platform-drivers-x86-v6.1-3' of... · a1de832b
      Linus Torvalds 提交于
      Merge tag 'platform-drivers-x86-v6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
      
      Pull x86 platform driver fixes from Hans de Goede:
       "The most important fixes here are a set of fixes for the ACPI
        backlight detection refactor which landed in 6.1.
      
        These fix regressions reported on some laptop models by making
        acpi_video_backlight_use_native() always return true for now, which in
        essence undoes some of the changes.
      
        I plan to take another shot at having only 1 /sys/class/backlight
        class device per panel with 6.2, with modified detection heuristics to
        avoid the (known) regressions.
      
        Highlights:
      
         - ACPI: video: Fix regressions from 6.1 backlight refactor by making
           acpi_video_backlight_use_native() always return true for now
      
         - Misc other bugfixes and HW id additions"
      
      * tag 'platform-drivers-x86-v6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
        platform/x86: p2sb: Don't fail if unknown CPU is found
        platform/x86/intel/hid: Add some ACPI device IDs
        platform/x86/intel/pmt: Sapphire Rapids PMT errata fix
        platform/x86: hp_wmi: Fix rfkill causing soft blocked wifi
        platform/x86: touchscreen_dmi: Add info for the RCA Cambio W101 v2 2-in-1
        platform/x86: ideapad-laptop: Disable touchpad_switch
        ACPI: video: Add backlight=native DMI quirk for Dell G15 5515
        ACPI: video: Make acpi_video_backlight_use_native() always return true
        ACPI: video: Improve Chromebook checks
      a1de832b
    • V
      mm, slab: remove duplicate kernel-doc comment for ksize() · c18c20f1
      Vlastimil Babka 提交于
      Akira reports:
      
      > "make htmldocs" reports duplicate C declaration of ksize() as follows:
      
      > /linux/Documentation/core-api/mm-api:43: ./mm/slab_common.c:1428: WARNING: Duplicate C declaration, also defined at core-api/mm-api:212.
      > Declaration is '.. c:function:: size_t ksize (const void *objp)'.
      
      > This is due to the kernel-doc comment for ksize() declaration added in
      > include/linux/slab.h by commit 05a94065 ("slab: Introduce
      > kmalloc_size_roundup()").
      
      There is an older kernel-doc comment for ksize() definition in
      mm/slab_common.c, which is not only duplicated, but also contradicts the
      new one - the additional storage discovered by ksize() should not be
      used by callers anymore. Delete the old kernel-doc.
      Reported-by: NAkira Yokosawa <akiyks@gmail.com>
      Link: https://lore.kernel.org/all/d33440f6-40cf-9747-3340-e54ffaf7afb8@gmail.com/
      Fixes: 05a94065 ("slab: Introduce kmalloc_size_roundup()")
      Cc: Kees Cook <keescook@chromium.org>
      Signed-off-by: NVlastimil Babka <vbabka@suse.cz>
      c18c20f1
  5. 07 11月, 2022 28 次提交
  6. 06 11月, 2022 2 次提交
    • P
      Merge tag 'kvmarm-fixes-6.1-3' of... · f4298cac
      Paolo Bonzini 提交于
      Merge tag 'kvmarm-fixes-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
      
      * Fix the pKVM stage-1 walker erronously using the stage-2 accessor
      
      * Correctly convert vcpu->kvm to a hyp pointer when generating
        an exception in a nVHE+MTE configuration
      
      * Check that KVM_CAP_DIRTY_LOG_* are valid before enabling them
      
      * Fix SMPRI_EL1/TPIDR2_EL0 trapping on VHE
      
      * Document the boot requirements for FGT when entering the kernel
        at EL1
      f4298cac
    • P
      Merge branch 'kvm-master' into HEAD · 14620149
      Paolo Bonzini 提交于
      x86:
      * Use SRCU to protect zap in __kvm_set_or_clear_apicv_inhibit()
      
      * Make argument order consistent for kvcalloc()
      
      * Userspace API fixes for DEBUGCTL and LBRs
      14620149