Skip to content
  1. Mar 22, 2022
    • Linus Torvalds's avatar
      Merge tag 'core-core-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bba90e09
      Linus Torvalds authored
      Pull core process handling RT latency updates from Thomas Gleixner:
      
       - Reduce the amount of work to release a task stack in context switch.
         There is no real reason to do cgroup accounting and memory freeing in
         this performance sensitive context.
      
         Aside of this the invoked functions cannot be called from this
         preemption disabled context on PREEMPT_RT enabled kernels. Solve this
         by moving the accounting into do_exit() and delaying the freeing of
         the stack unless the vmap stack can be cached.
      
       - Provide a mechanism to delay raising signals from atomic context on
         PREEMPT_RT enabled kernels as sighand::lock cannot be acquired. Store
         the information in the task struct and raise it in the exit path.
      
      * tag 'core-core-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        signal, x86: Delay calling signals in atomic on RT enabled kernels
        fork: Use IS_ENABLED() in account_kernel_stack()
        fork: Only cache the VMAP stack in finish_task_switch()
        fork: Move task stack accounting to do_exit()
        fork: Move memcg_charge_kernel_stack() into CONFIG_VMAP_STACK
        fork: Don't assign the stack pointer in dup_task_struct()
        fork, IA64: Provide alloc_thread_stack_node() for IA64
        fork: Duplicate task_struct before stack allocation
        fork: Redo ifdefs around task stack handling
      bba90e09
    • Linus Torvalds's avatar
      Merge tag 'x86-pasid-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3fd33273
      Linus Torvalds authored
      Pull x86 PASID support from Thomas Gleixner:
       "Reenable ENQCMD/PASID support:
      
         - Simplify the PASID handling to allocate the PASID once, associate
           it to the mm of a process and free it on mm_exit().
      
           The previous attempt of refcounted PASIDs and dynamic
           alloc()/free() turned out to be error prone and too complex. The
           PASID space is 20bits, so the case of resource exhaustion is a pure
           academic concern.
      
         - Populate the PASID MSR on demand via #GP to avoid racy updates via
           IPIs.
      
         - Reenable ENQCMD and let objtool check for the forbidden usage of
           ENQCMD in the kernel.
      
         - Update the documentation for Shared Virtual Addressing accordingly"
      
      * tag 'x86-pasid-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Documentation/x86: Update documentation for SVA (Shared Virtual Addressing)
        tools/objtool: Check for use of the ENQCMD instruction in the kernel
        x86/cpufeatures: Re-enable ENQCMD
        x86/traps: Demand-populate PASID MSR via #GP
        sched: Define and initialize a flag to identify valid PASID in the task
        x86/fpu: Clear PASID when copying fpstate
        iommu/sva: Assign a PASID to mm on PASID allocation and free it on mm exit
        kernel/fork: Initialize mm's PASID
        iommu/ioasid: Introduce a helper to check for valid PASIDs
        mm: Change CONFIG option for mm->pasid field
        iommu/sva: Rename CONFIG_IOMMU_SVA_LIB to CONFIG_IOMMU_SVA
      3fd33273
    • Linus Torvalds's avatar
      Merge tag 'x86_cleanups_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · eaa54b14
      Linus Torvalds authored
      Pull x86 cleanups from Borislav Petkov:
      
       - Remove a misleading message and an unused function
      
      * tag 'x86_cleanups_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/nmi: Remove the 'strange power saving mode' hint from unknown NMI handler
        x86/pat: Remove the unused set_pages_array_wt() function
      eaa54b14
    • Linus Torvalds's avatar
      Merge tag 'x86_cc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6b9bfb13
      Linus Torvalds authored
      Pull x86 confidential computing updates from Borislav Petkov:
      
       - Add shared confidential computing code which will be used by both
         vendors instead of proliferating home-grown solutions for
         technologies (SEV/SNP and TDX) which are pretty similar
      
      * tag 'x86_cc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm/cpa: Generalize __set_memory_enc_pgtable()
        x86/coco: Add API to handle encryption mask
        x86/coco: Explicitly declare type of confidential computing platform
        x86/cc: Move arch/x86/{kernel/cc_platform.c => coco/core.c}
      6b9bfb13
    • Linus Torvalds's avatar
      Merge tag 'x86_sgx_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 61e2658e
      Linus Torvalds authored
      Pull x86 SGX updates from Borislav Petkov:
      
       - A couple of fixes and improvements to the SGX selftests
      
      * tag 'x86_sgx_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        selftests/sgx: Treat CC as one argument
        selftests/x86: Add validity check and allow field splitting
        selftests/sgx: Remove extra newlines in test output
        selftests/sgx: Ensure enclave data available during debug print
        selftests/sgx: Do not attempt enclave build without valid enclave
        selftests/sgx: Fix NULL-pointer-dereference upon early test failure
      61e2658e
    • Linus Torvalds's avatar
      Merge tag 'x86_sev_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 88f30ac2
      Linus Torvalds authored
      Pull x86 SEV fix from Borislav Petkov:
      
       - Add a missing function section annotation
      
      * tag 'x86_sev_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/head64: Add missing __head annotation to sme_postprocess_startup()
      88f30ac2
    • Linus Torvalds's avatar
      Merge tag 'x86_paravirt_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 35cbdaf7
      Linus Torvalds authored
      Pull x86 paravirt improvement from Borislav Petkov:
      
       - Shorten CALL insns to pvops by a byte by using rip-relative
         addressing
      
      * tag 'x86_paravirt_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/paravirt: Use %rip-relative addressing in hook calls
      35cbdaf7
    • Linus Torvalds's avatar
      Merge tag 'x86_build_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e10821b8
      Linus Torvalds authored
      Pull x86 Kconfig fix from Borislav Petkov:
      
       - Correct Kconfig symbol visibility on x86
      
      * tag 'x86_build_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/Kconfig: Select ARCH_SELECT_MEMORY_MODEL only if FLATMEM and SPARSEMEM are possible
      e10821b8
    • Linus Torvalds's avatar
      Merge tag 'x86_misc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 22687350
      Linus Torvalds authored
      Pull misc x86 updates from Borislav Petkov:
      
       - Add support for a couple new insn sets to the insn decoder:
         AVX512-FP16, AMX, other misc insns.
      
       - Update VMware-specific MAINTAINERS entries
      
      * tag 'x86_misc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        MAINTAINERS: Mark VMware mailing list entries as email aliases
        MAINTAINERS: Add Zack as maintainer of vmmouse driver
        MAINTAINERS: Update maintainers for paravirt ops and VMware hypervisor interface
        x86/insn: Add AVX512-FP16 instructions to the x86 instruction decoder
        perf/tests: Add AVX512-FP16 instructions to x86 instruction decoder test
        x86/insn: Add misc instructions to x86 instruction decoder
        perf/tests: Add misc instructions to the x86 instruction decoder test
        x86/insn: Add AMX instructions to the x86 instruction decoder
        perf/tests: Add AMX instructions to x86 instruction decoder test
      22687350
    • Linus Torvalds's avatar
      Merge tag 'x86_cpu_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d752e211
      Linus Torvalds authored
      Pull x86 cpu feature updates from Borislav Petkov:
      
       - Merge the AMD and Intel PPIN code into a shared one by both vendors.
         Add the PPIN number to sysfs so that sockets can be identified when
         replacement is needed
      
       - Minor fixes and cleanups
      
      * tag 'x86_cpu_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cpu: Clear SME feature flag when not in use
        x86/cpufeatures: Put the AMX macros in the word 18 block
        topology/sysfs: Add PPIN in sysfs under cpu topology
        topology/sysfs: Add format parameter to macro defining "show" functions for proc
        x86/cpu: Read/save PPIN MSR during initialization
        x86/cpu: X86_FEATURE_INTEL_PPIN finally has a CPUID bit
        x86/cpu: Merge Intel and AMD ppin_init() functions
        x86/CPU/AMD: Use default_groups in kobj_type
      d752e211
    • Linus Torvalds's avatar
      Merge tag 'edac_updates_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · 5e891917
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
      
       - Add support for newer AMD family 0x19, models 0x10-... CPUs to
         amd64_edac
      
       - The usual amount of improvements and fixes
      
      * tag 'edac_updates_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
        EDAC/altera: Add SDRAM ECC check for U-Boot
        EDAC/amd64: Add new register offset support and related changes
        EDAC/amd64: Set memory type per DIMM
        EDAC/mc: Remove unnecessary cast to char * in edac_align_ptr()
        EDAC: Use default_groups in kobj_type
        EDAC: Use proper list of struct attribute for attributes
      5e891917
    • Linus Torvalds's avatar
      Merge tag 'm68k-for-v5.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 1b74b460
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
      
       - Fix frame buffers backed by deferred I/O
      
       - defconfig updates
      
       - Minor fixes and improvements
      
      * tag 'm68k-for-v5.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: defconfig: Disable fbdev on Sun3/3x
        m68k: defconfig: Update defconfigs for v5.17-rc3
        m68k: mm: Remove check for VM_IO to fix deferred I/O
        m68k: Add asm/config.h
      1b74b460
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · 90ea15b7
      Linus Torvalds authored
      Pull ARM updates from Russell King:
      
       - amba bus cleanups
      
       - conversion to use reserve_initrd_mem()
      
       - remove -nostdlib from vdso link
      
      * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 9181/1: vdso: remove -nostdlib compiler flag
        ARM: 9175/1: Convert to reserve_initrd_mem()
        ARM: 9174/1: amba: Move EXPORT_SYMBOL() closer to definition
        ARM: 9173/1: amba: kill amba_find_match()
        ARM: 9172/1: amba: Cleanup amba pclk operation
      90ea15b7
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 356a1adc
      Linus Torvalds authored
      Pull arm64 updates from Will Deacon:
      
       - Support for including MTE tags in ELF coredumps
      
       - Instruction encoder updates, including fixes to 64-bit immediate
         generation and support for the LSE atomic instructions
      
       - Improvements to kselftests for MTE and fpsimd
      
       - Symbol aliasing and linker script cleanups
      
       - Reduce instruction cache maintenance performed for user mappings
         created using contiguous PTEs
      
       - Support for the new "asymmetric" MTE mode, where stores are checked
         asynchronously but loads are checked synchronously
      
       - Support for the latest pointer authentication algorithm ("QARMA3")
      
       - Support for the DDR PMU present in the Marvell CN10K platform
      
       - Support for the CPU PMU present in the Apple M1 platform
      
       - Use the RNDR instruction for arch_get_random_{int,long}()
      
       - Update our copy of the Arm optimised string routines for str{n}cmp()
      
       - Fix signal frame generation for CPUs which have foolishly elected to
         avoid building in support for the fpsimd instructions
      
       - Workaround for Marvell GICv3 erratum #38545
      
       - Clarification to our Documentation (booting reqs. and MTE prctl())
      
       - Miscellanous cleanups and minor fixes
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (90 commits)
        docs: sysfs-devices-system-cpu: document "asymm" value for mte_tcf_preferred
        arm64/mte: Remove asymmetric mode from the prctl() interface
        arm64: Add cavium_erratum_23154_cpus missing sentinel
        perf/marvell: Fix !CONFIG_OF build for CN10K DDR PMU driver
        arm64: mm: Drop 'const' from conditional arm64_dma_phys_limit definition
        Documentation: vmcoreinfo: Fix htmldocs warning
        kasan: fix a missing header include of static_keys.h
        drivers/perf: Add Apple icestorm/firestorm CPU PMU driver
        drivers/perf: arm_pmu: Handle 47 bit counters
        arm64: perf: Consistently make all event numbers as 16-bits
        arm64: perf: Expose some Armv9 common events under sysfs
        perf/marvell: cn10k DDR perf event core ownership
        perf/marvell: cn10k DDR perfmon event overflow handling
        perf/marvell: CN10k DDR performance monitor support
        dt-bindings: perf: marvell: cn10k ddr performance monitor
        arm64: clean up tools Makefile
        perf/arm-cmn: Update watchpoint format
        perf/arm-cmn: Hide XP PUB events for CMN-600
        arm64: drop unused includes of <linux/personality.h>
        arm64: Do not defer reserve_crashkernel() for platforms with no DMA memory zones
        ...
      356a1adc
    • Linus Torvalds's avatar
      Merge tag 'tpmdd-next-v5.18-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd · 9d8e7007
      Linus Torvalds authored
      Pull tpm updates from Jarkko Sakkinen:
       "In order to split the work a bit we've aligned with David Howells more
        or less that I take more hardware/firmware aligned keyring patches,
        and he takes care more of the framework aligned patches.
      
        For TPM the patches worth of highlighting are the fixes for
        refcounting provided by Lino Sanfilippo and James Bottomley.
      
        Eric B. has done a bunch obvious (but important) fixes but there's one
        a bit controversial: removal of asym_tpm. It was added in 2018 when
        TPM1 was already declared as insecure and world had moved on to TPM2.
        I don't know how this has passed all the filters but I did not have a
        chance to see the patches when they were out. I simply cannot commit
        to maintaining this because it was from all angles just wrong to take
        it in the first place to the mainline kernel. Nobody should use this
        module really for anything.
      
        Finally, there is a new keyring '.machine' to hold MOK keys ('Machine
        Owner Keys'). In the mok side MokListTrustedRT UEFI variable can be
        set, from which kernel knows that MOK keys are kernel trusted keys and
        they are populated to the machine keyring. This keyring linked to the
        secondary trusted keyring, which means that can be used like any
        kernel trusted keys. This keyring of course can be used to hold other
        MOK'ish keys in other platforms in future"
      
      * tag 'tpmdd-next-v5.18-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd: (24 commits)
        tpm: use try_get_ops() in tpm-space.c
        KEYS: asymmetric: properly validate hash_algo and encoding
        KEYS: asymmetric: enforce that sig algo matches key algo
        KEYS: remove support for asym_tpm keys
        tpm: fix reference counting for struct tpm_chip
        integrity: Only use machine keyring when uefi_check_trust_mok_keys is true
        integrity: Trust MOK keys if MokListTrustedRT found
        efi/mokvar: move up init order
        KEYS: Introduce link restriction for machine keys
        KEYS: store reference to machine keyring
        integrity: add new keyring handler for mok keys
        integrity: Introduce a Linux keyring called machine
        integrity: Fix warning about missing prototypes
        KEYS: trusted: Avoid calling null function trusted_key_exit
        KEYS: trusted: Fix trusted key backends when building as module
        tpm: xen-tpmfront: Use struct_size() helper
        KEYS: x509: remove dead code that set ->unsupported_sig
        KEYS: x509: remove never-set ->unsupported_key flag
        KEYS: x509: remove unused fields
        KEYS: x509: clearly distinguish between key and signature algorithms
        ...
      9d8e7007
  2. Mar 21, 2022
  3. Mar 20, 2022
  4. Mar 19, 2022
  5. Mar 18, 2022
    • Arnd Bergmann's avatar
      arm64: errata: avoid duplicate field initializer · 316e46f6
      Arnd Bergmann authored
      
      
      The '.type' field is initialized both in place and in the macro
      as reported by this W=1 warning:
      
      arch/arm64/include/asm/cpufeature.h:281:9: error: initialized field overwritten [-Werror=override-init]
        281 |         (ARM64_CPUCAP_SCOPE_LOCAL_CPU | ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU)
            |         ^
      arch/arm64/kernel/cpu_errata.c:136:17: note: in expansion of macro 'ARM64_CPUCAP_LOCAL_CPU_ERRATUM'
        136 |         .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,                         \
            |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      arch/arm64/kernel/cpu_errata.c:145:9: note: in expansion of macro 'ERRATA_MIDR_RANGE'
        145 |         ERRATA_MIDR_RANGE(m, var, r_min, var, r_max)
            |         ^~~~~~~~~~~~~~~~~
      arch/arm64/kernel/cpu_errata.c:613:17: note: in expansion of macro 'ERRATA_MIDR_REV_RANGE'
        613 |                 ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 2),
            |                 ^~~~~~~~~~~~~~~~~~~~~
      arch/arm64/include/asm/cpufeature.h:281:9: note: (near initialization for 'arm64_errata[18].type')
        281 |         (ARM64_CPUCAP_SCOPE_LOCAL_CPU | ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU)
            |         ^
      
      Remove the extranous initializer.
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Fixes: 1dd498e5 ("KVM: arm64: Workaround Cortex-A510's single-step and PAC trap errata")
      Link: https://lore.kernel.org/r/20220316183800.1546731-1-arnd@kernel.org
      
      
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      316e46f6
    • Arnd Bergmann's avatar
      arm64: fix clang warning about TRAMP_VALIAS · 7f34b43e
      Arnd Bergmann authored
      
      
      The newly introduced TRAMP_VALIAS definition causes a build warning
      with clang-14:
      
      arch/arm64/include/asm/vectors.h:66:31: error: arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension [-Werror,-Wnull-pointer-arithmetic]
                      return (char *)TRAMP_VALIAS + SZ_2K * slot;
      
      Change the addition to something clang does not complain about.
      
      Fixes: bd09128d ("arm64: Add percpu vectors for EL1")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarJames Morse <james.morse@arm.com>
      Link: https://lore.kernel.org/r/20220316183833.1563139-1-arnd@kernel.org
      
      
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      7f34b43e
    • Dave Airlie's avatar
      Merge tag 'drm-misc-fixes-2022-03-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes · ca5a5761
      Dave Airlie authored
      
      
       * drm/imx: Don't test bus flags in atomic check
       * drm/mgag200: Fix PLL setup on some models
       * drm/panel: Fix bpp settings on Innolux G070Y2-L01; Fix DRM_PANEL_EDP
         Kconfig dependencies
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Thomas Zimmermann <tzimmermann@suse.de>
      Link: https://patchwork.freedesktop.org/patch/msgid/YjMNcqOuDFDoe+EN@linux-uq9g
      ca5a5761
    • Linus Torvalds's avatar
      Merge tag 'net-5.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 551acdc3
      Linus Torvalds authored
      Pull networking fixes from Jakub Kicinski:
       "Including fixes from netfilter, ipsec, and wireless.
      
        A few last minute revert / disable and fix patches came down from our
        sub-trees. We're not waiting for any fixes at this point.
      
        Current release - regressions:
      
         - Revert "netfilter: nat: force port remap to prevent shadowing
           well-known ports", restore working conntrack on asymmetric paths
      
         - Revert "ath10k: drop beacon and probe response which leak from
           other channel", restore working AP and mesh mode on QCA9984
      
         - eth: intel: fix hang during reboot/shutdown
      
        Current release - new code bugs:
      
         - netfilter: nf_tables: disable register tracking, it needs more work
           to cover all corner cases
      
        Previous releases - regressions:
      
         - ipv6: fix skb_over_panic in __ip6_append_data when (admin-only)
           extension headers get specified
      
         - esp6: fix ESP over TCP/UDP, interpret ipv6_skip_exthdr's return
           value more selectively
      
         - bnx2x: fix driver load failure when FW not present in initrd
      
        Previous releases - always broken:
      
         - vsock: stop destroying unrelated sockets in nested virtualization
      
         - packet: fix slab-out-of-bounds access in packet_recvmsg()
      
        Misc:
      
         - add Paolo Abeni to networking maintainers!"
      
      * tag 'net-5.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (26 commits)
        iavf: Fix hang during reboot/shutdown
        net: mscc: ocelot: fix backwards compatibility with single-chain tc-flower offload
        net: bcmgenet: skip invalid partial checksums
        bnx2x: fix built-in kernel driver load failure
        net: phy: mscc: Add MODULE_FIRMWARE macros
        net: dsa: Add missing of_node_put() in dsa_port_parse_of
        net: handle ARPHRD_PIMREG in dev_is_mac_header_xmit()
        Revert "ath10k: drop beacon and probe response which leak from other channel"
        hv_netvsc: Add check for kvmalloc_array
        iavf: Fix double free in iavf_reset_task
        ice: destroy flow director filter mutex after releasing VSIs
        ice: fix NULL pointer dereference in ice_update_vsi_tx_ring_stats()
        Add Paolo Abeni to networking maintainers
        atm: eni: Add check for dma_map_single
        net/packet: fix slab-out-of-bounds access in packet_recvmsg()
        net: mdio: mscc-miim: fix duplicate debugfs entry
        net: phy: marvell: Fix invalid comparison in the resume and suspend functions
        esp6: fix check on ipv6_skip_exthdr's return value
        net: dsa: microchip: add spi_device_id tables
        netfilter: nf_tables: disable register tracking
        ...
      551acdc3
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.17-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · c81801eb
      Linus Torvalds authored
      Pull ACPI fix from Rafael Wysocki:
       "Revert recent commit that caused multiple systems to misbehave due to
        firmware issues"
      
      * tag 'acpi-5.17-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "ACPI: scan: Do not add device IDs from _CID if _HID is not valid"
      c81801eb
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 2ab99e54
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "Four patches.
      
        Subsystems affected by this patch series: mm/swap, kconfig, ocfs2, and
        selftests"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        selftests: vm: fix clang build error multiple output files
        ocfs2: fix crash when initialize filecheck kobj fails
        configs/debug: restore DEBUG_INFO=y for overriding
        mm: swap: get rid of livelock in swapin readahead
      2ab99e54
    • Yosry Ahmed's avatar
      selftests: vm: fix clang build error multiple output files · 1c4debc4
      Yosry Ahmed authored
      When building the vm selftests using clang, some errors are seen due to
      having headers in the compilation command:
      
        clang -Wall -I ../../../../usr/include  -no-pie    gup_test.c ../../../../mm/gup_test.h -lrt -lpthread -o .../tools/testing/selftests/vm/gup_test
        clang: error: cannot specify -o when generating multiple output files
        make[1]: *** [../lib.mk:146: .../tools/testing/selftests/vm/gup_test] Error 1
      
      Rework to add the header files to LOCAL_HDRS before including ../lib.mk,
      since the dependency is evaluated in '$(OUTPUT)/%:%.c $(LOCAL_HDRS)' in
      file lib.mk.
      
      Link: https://lkml.kernel.org/r/20220304000645.1888133-1-yosryahmed@google.com
      
      
      Signed-off-by: default avatarYosry Ahmed <yosryahmed@google.com>
      Cc: Shuah Khan <shuah@kernel.org>
      Cc: Nathan Chancellor <nathan@kernel.org>
      Cc: Nick Desaulniers <ndesaulniers@google.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1c4debc4
    • Joseph Qi's avatar
      ocfs2: fix crash when initialize filecheck kobj fails · 7b0b1332
      Joseph Qi authored
      Once s_root is set, genric_shutdown_super() will be called if
      fill_super() fails.  That means, we will call ocfs2_dismount_volume()
      twice in such case, which can lead to kernel crash.
      
      Fix this issue by initializing filecheck kobj before setting s_root.
      
      Link: https://lkml.kernel.org/r/20220310081930.86305-1-joseph.qi@linux.alibaba.com
      
      
      Fixes: 5f483c4a ("ocfs2: add kobject for online file check")
      Signed-off-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
      Cc: Mark Fasheh <mark@fasheh.com>
      Cc: Joel Becker <jlbec@evilplan.org>
      Cc: Junxiao Bi <junxiao.bi@oracle.com>
      Cc: Changwei Ge <gechangwei@live.cn>
      Cc: Gang He <ghe@suse.com>
      Cc: Jun Piao <piaojun@huawei.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7b0b1332