Changes in Makefile

a5210135489ae7bc1ef1cb4a8157361dd7b468cd - Merge tag 'v7.0-rc7' into char-misc-next

Mon, 06 Apr 2026 09:04:53 +0200

Merge tag 'v7.0-rc7' into char-misc-nextWe need the char/misc/iio/comedi fixes in here as well for testingSigned-off-by: Greg Kroah-Hartman List of files: /linux/arch/arm64/kernel/Makefile

500af712f9cb61e9e3d32760df0cc5dd4f3046aa - Merge branch 'for-7.1/winwing' into for-linus

Thu, 16 Apr 2026 21:03:22 +0200

Merge branch 'for-7.1/winwing' into for-linus- support for rubmle effects in winwing driver (Ivan Gorinov) List of files: /linux/arch/arm64/kernel/Makefile

c43267e6794a36013fd495a4d81bf7f748fe4615 - Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Wed, 15 Apr 2026 01:48:56 +0200

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linuxPull arm64 updates from Catalin Marinas: "The biggest changes are MPAM enablement in drivers/resctrl and new PMU support under drivers/perf. On the core side, FEAT_LSUI lets futex atomic operations with EL0 permissions, avoiding PAN toggling. The rest is mostly TLB invalidation refactoring, further generic entry work, sysreg updates and a few fixes. Core features: - Add support for FEAT_LSUI, allowing futex atomic operations without toggling Privileged Access Never (PAN) - Further refactor the arm64 exception handling code towards the generic entry infrastructure - Optimise __READ_ONCE() with CONFIG_LTO=y and allow alias analysis through it Memory management: - Refactor the arm64 TLB invalidation API and implementation for better control over barrier placement and level-hinted invalidation - Enable batched TLB flushes during memory hot-unplug - Fix rodata=full block mapping support for realm guests (when BBML2_NOABORT is available) Perf and PMU: - Add support for a whole bunch of system PMUs featured in NVIDIA's Tegra410 SoC (cspmu extensions for the fabric and PCIe, new drivers for CPU/C2C memory latency PMUs) - Clean up iomem resource handling in the Arm CMN driver - Fix signedness handling of AA64DFR0.{PMUVer,PerfMon} MPAM (Memory Partitioning And Monitoring): - Add architecture context-switch and hiding of the feature from KVM - Add interface to allow MPAM to be exposed to user-space using resctrl - Add errata workaround for some existing platforms - Add documentation for using MPAM and what shape of platforms can use resctrl Miscellaneous: - Check DAIF (and PMR, where relevant) at task-switch time - Skip TFSR_EL1 checks and barriers in synchronous MTE tag check mode (only relevant to asynchronous or asymmetric tag check modes) - Remove a duplicate allocation in the kexec code - Remove redundant save/restore of SCS SP on entry to/from EL0 - Generate the KERNEL_HWCAP_ definitions from the arm64 hwcap descriptions - Add kselftest coverage for cmpbr_sigill() - Update sysreg definitions"* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (109 commits) arm64: rsi: use linear-map alias for realm config buffer arm64: Kconfig: fix duplicate word in CMDLINE help text arm64: mte: Skip TFSR_EL1 checks and barriers in synchronous tag check mode arm64/sysreg: Update ID_AA64SMFR0_EL1 description to DDI0601 2025-12 arm64/sysreg: Update ID_AA64ZFR0_EL1 description to DDI0601 2025-12 arm64/sysreg: Update ID_AA64FPFR0_EL1 description to DDI0601 2025-12 arm64/sysreg: Update ID_AA64ISAR2_EL1 description to DDI0601 2025-12 arm64/sysreg: Update ID_AA64ISAR0_EL1 description to DDI0601 2025-12 arm64/hwcap: Generate the KERNEL_HWCAP_ definitions for the hwcaps arm64: kexec: Remove duplicate allocation for trans_pgd ACPI: AGDI: fix missing newline in error message arm64: Check DAIF (and PMR) at task-switch time arm64: entry: Use split preemption logic arm64: entry: Use irqentry_{enter_from,exit_to}_kernel_mode() arm64: entry: Consistently prefix arm64-specific wrappers arm64: entry: Don't preempt with SError or Debug masked entry: Split preemption from irqentry_exit_to_kernel_mode() entry: Split kernel mode logic from irqentry_{enter,exit}() entry: Move irqentry_enter() prototype later entry: Remove local_irq_{enable,disable}_exit_to_user() ... List of files: /linux/arch/arm64/kernel/Makefile

ff1c0c5d07028a84837950b619d30da623f8ddb2 - Merge branch 'timers/urgent' into timers/core

Sat, 11 Apr 2026 07:58:33 +0200

Merge branch 'timers/urgent' into timers/coreto resolve the conflict with urgent fixes. List of files: /linux/arch/arm64/kernel/Makefile

480a9e57cceaf42db6ff874dbfe91de201935035 - Merge branches 'for-next/misc', 'for-next/tlbflush', 'for-next/ttbr-macros-cleanup', 'for-next/kselftest', 'for-next/feat_lsui', 'for-next/mpam', 'for-next/hotplug-batched-tlbi', 'for-next/bbml2-fixes', 'for-next/sysreg', 'for-next/generic-entry' and 'for-next/acpi', remote-tracking branches 'arm64/for-next/perf' and 'arm64/for-next/read-once' into for-next/core

Fri, 10 Apr 2026 15:22:24 +0200

Merge branches 'for-next/misc', 'for-next/tlbflush', 'for-next/ttbr-macros-cleanup', 'for-next/kselftest', 'for-next/feat_lsui', 'for-next/mpam', 'for-next/hotplug-batched-tlbi', 'for-next/bbml2-fixes', 'for-next/sysreg', 'for-next/generic-entry' and 'for-next/acpi', remote-tracking branches 'arm64/for-next/perf' and 'arm64/for-next/read-once' into for-next/core* arm64/for-next/perf: : Perf updates perf/arm-cmn: Fix resource_size_t printk specifier in arm_cmn_init_dtc() perf/arm-cmn: Fix incorrect error check for devm_ioremap() perf: add NVIDIA Tegra410 C2C PMU perf: add NVIDIA Tegra410 CPU Memory Latency PMU perf/arm_cspmu: nvidia: Add Tegra410 PCIE-TGT PMU perf/arm_cspmu: nvidia: Add Tegra410 PCIE PMU perf/arm_cspmu: Add arm_cspmu_acpi_dev_get perf/arm_cspmu: nvidia: Add Tegra410 UCF PMU perf/arm_cspmu: nvidia: Rename doc to Tegra241 perf/arm-cmn: Stop claiming entire iomem region arm64: cpufeature: Use pmuv3_implemented() function arm64: cpufeature: Make PMUVer and PerfMon unsigned KVM: arm64: Read PMUVer as unsigned* arm64/for-next/read-once: : Fixes for __READ_ONCE() with CONFIG_LTO=y arm64, compiler-context-analysis: Permit alias analysis through __READ_ONCE() with CONFIG_LTO=y arm64: Optimize __READ_ONCE() with CONFIG_LTO=y* for-next/misc: : Miscellaneous cleanups/fixes arm64: rsi: use linear-map alias for realm config buffer arm64: Kconfig: fix duplicate word in CMDLINE help text arm64: mte: Skip TFSR_EL1 checks and barriers in synchronous tag check mode arm64/hwcap: Generate the KERNEL_HWCAP_ definitions for the hwcaps arm64: kexec: Remove duplicate allocation for trans_pgd arm64: mm: Use generic enum pgtable_level arm64: scs: Remove redundant save/restore of SCS SP on entry to/from EL0 arm64: remove ARCH_INLINE_** for-next/tlbflush: : Refactor the arm64 TLB invalidation API and implementation arm64: mm: __ptep_set_access_flags must hint correct TTL arm64: mm: Provide level hint for flush_tlb_page() arm64: mm: Wrap flush_tlb_page() around __do_flush_tlb_range() arm64: mm: More flags for __flush_tlb_range() arm64: mm: Refactor __flush_tlb_range() to take flags arm64: mm: Refactor flush_tlb_page() to use __tlbi_level_asid() arm64: mm: Simplify __flush_tlb_range_limit_excess() arm64: mm: Simplify __TLBI_RANGE_NUM() macro arm64: mm: Re-implement the __flush_tlb_range_op macro in C arm64: mm: Inline __TLBI_VADDR_RANGE() into __tlbi_range() arm64: mm: Push __TLBI_VADDR() into __tlbi_level() arm64: mm: Implicitly invalidate user ASID based on TLBI operation arm64: mm: Introduce a C wrapper for by-range TLB invalidation arm64: mm: Re-implement the __tlbi_level macro as a C function* for-next/ttbr-macros-cleanup: : Cleanups of the TTBR1_* macros arm64/mm: Directly use TTBRx_EL1_CnP arm64/mm: Directly use TTBRx_EL1_ASID_MASK arm64/mm: Describe TTBR1_BADDR_4852_OFFSET* for-next/kselftest: : arm64 kselftest updates selftests/arm64: Implement cmpbr_sigill() to hwcap test* for-next/feat_lsui: : Futex support using FEAT_LSUI instructions to avoid toggling PAN arm64: armv8_deprecated: Disable swp emulation when FEAT_LSUI present arm64: Kconfig: Add support for LSUI KVM: arm64: Use CAST instruction for swapping guest descriptor arm64: futex: Support futex with FEAT_LSUI arm64: futex: Refactor futex atomic operation KVM: arm64: kselftest: set_id_regs: Add test for FEAT_LSUI KVM: arm64: Expose FEAT_LSUI to guests arm64: cpufeature: Add FEAT_LSUI* for-next/mpam: (40 commits) : Expose MPAM to user-space via resctrl: : - Add architecture context-switch and hiding of the feature from KVM. : - Add interface to allow MPAM to be exposed to user-space using resctrl. : - Add errata workaoround for some existing platforms. : - Add documentation for using MPAM and what shape of platforms can use resctrl arm64: mpam: Add initial MPAM documentation arm_mpam: Quirk CMN-650's CSU NRDY behaviour arm_mpam: Add workaround for T241-MPAM-6 arm_mpam: Add workaround for T241-MPAM-4 arm_mpam: Add workaround for T241-MPAM-1 arm_mpam: Add quirk framework arm_mpam: resctrl: Call resctrl_init() on platforms that can support resctrl arm64: mpam: Select ARCH_HAS_CPU_RESCTRL arm_mpam: resctrl: Add empty definitions for assorted resctrl functions arm_mpam: resctrl: Update the rmid reallocation limit arm_mpam: resctrl: Add resctrl_arch_rmid_read() arm_mpam: resctrl: Allow resctrl to allocate monitors arm_mpam: resctrl: Add support for csu counters arm_mpam: resctrl: Add monitor initialisation and domain boilerplate arm_mpam: resctrl: Add kunit test for control format conversions arm_mpam: resctrl: Add support for 'MB' resource arm_mpam: resctrl: Wait for cacheinfo to be ready arm_mpam: resctrl: Add rmid index helpers arm_mpam: resctrl: Convert to/from MPAMs fixed-point formats arm_mpam: resctrl: Hide CDP emulation behind CONFIG_EXPERT ...* for-next/hotplug-batched-tlbi: : arm64/mm: Enable batched TLB flush in unmap_hotplug_range() arm64/mm: Reject memory removal that splits a kernel leaf mapping arm64/mm: Enable batched TLB flush in unmap_hotplug_range()* for-next/bbml2-fixes: : Fixes for realm guest and BBML2_NOABORT arm64: mm: Remove pmd_sect() and pud_sect() arm64: mm: Handle invalid large leaf mappings correctly arm64: mm: Fix rodata=full block mapping support for realm guests* for-next/sysreg: : arm64 sysreg updates arm64/sysreg: Update ID_AA64SMFR0_EL1 description to DDI0601 2025-12 arm64/sysreg: Update ID_AA64ZFR0_EL1 description to DDI0601 2025-12 arm64/sysreg: Update ID_AA64FPFR0_EL1 description to DDI0601 2025-12 arm64/sysreg: Update ID_AA64ISAR2_EL1 description to DDI0601 2025-12 arm64/sysreg: Update ID_AA64ISAR0_EL1 description to DDI0601 2025-12 arm64/sysreg: Update SMIDR_EL1 to DDI0601 2025-06* for-next/generic-entry: : More arm64 refactoring towards using the generic entry code arm64: Check DAIF (and PMR) at task-switch time arm64: entry: Use split preemption logic arm64: entry: Use irqentry_{enter_from,exit_to}_kernel_mode() arm64: entry: Consistently prefix arm64-specific wrappers arm64: entry: Don't preempt with SError or Debug masked entry: Split preemption from irqentry_exit_to_kernel_mode() entry: Split kernel mode logic from irqentry_{enter,exit}() entry: Move irqentry_enter() prototype later entry: Remove local_irq_{enable,disable}_exit_to_user() entry: Fix stale comment for irqentry_enter()* for-next/acpi: : arm64 ACPI updates ACPI: AGDI: fix missing newline in error message List of files: /linux/arch/arm64/kernel/Makefile

b6e39e48469e37057fce27a1b87cf6d3e456aa42 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 02 Apr 2026 19:57:09 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR (net-7.0-rc8).Conflicts:net/ipv6/seg6_iptunnel.c c3812651b522f ("seg6: separate dst_cache for input and output paths in seg6 lwtunnel") 78723a62b969a ("seg6: add per-route tunnel source address")https://lore.kernel.org/adZhwtOYfo-0ImSa@sirena.org.uknet/ipv4/icmp.c fde29fd934932 ("ipv4: icmp: fix null-ptr-deref in icmp_build_probe()") d98adfbdd5c01 ("ipv4: drop ipv6_stub usage and use direct function calls")https://lore.kernel.org/adO3dccqnr6j-BL9@sirena.org.ukAdjacent changes:drivers/net/ethernet/stmicro/stmmac/chain_mode.c 51f4e090b9f8 ("net: stmmac: fix integer underflow in chain mode") 6b4286e05508 ("net: stmmac: rename STMMAC_GET_ENTRY() -> STMMAC_NEXT_ENTRY()")Signed-off-by: Jakub Kicinski List of files: /linux/arch/arm64/kernel/Makefile

e7ef5ec6d1f0568e5c11ceeb729f412560ad8ef7 - regulator: fix OF node imbalance on reuse

Thu, 09 Apr 2026 21:19:36 +0200

regulator: fix OF node imbalance on reuseJohan Hovold says:These drivers reuse the OF node of their parent multi-function devicebut fail to take another reference to balance the one dropped by theplatform bus code when unbinding the MFD and deregistering the childdevices.Fix this by using the intended helper for reusing OF nodes.Note that the first two patches will cause a trivial conflict with Doug'sseries adding accessor functions for struct device flags which has now beenmerged to the driver-core tree: https://lore.kernel.org/r/20260406232444.3117516-1-dianders@chromium.orgLink: https://patch.msgid.link/20260408073055.5183-1-johan@kernel.org List of files: /linux/arch/arm64/kernel/Makefile

3f44bccdd6605d5d156c02ea2f861dcd30ef5dcd - Merge branch 'for-linus' into for-next

Thu, 09 Apr 2026 08:31:21 +0200

Merge branch 'for-linus' into for-nextPull 7.0-devel branch for further development of HD-audio codec quirks.Signed-off-by: Takashi Iwai List of files: /linux/arch/arm64/kernel/Makefile

2c9e7a5f2e3f398213c0c122c18ffa2f4e192457 - Add Renesas RZ/G3L RSPI support

Wed, 08 Apr 2026 16:57:55 +0200

Add Renesas RZ/G3L RSPI supportBiju says:This patch series adds binding and driver support for RSPI IP found on theRZ/G3L SoC. The RSPI is compatible with RZ/V2H RSPI, but has 2 clockscompared to 3 on RZ/V2H.Link: https://patch.msgid.link/20260408085418.18770-1-biju.das.jz@bp.renesas.com List of files: /linux/arch/arm64/kernel/Makefile

cc201899a972c9358639720404795d5a73acb1b4 - ASoC: Merge up v7.0-rc7

Tue, 07 Apr 2026 16:43:29 +0200

ASoC: Merge up v7.0-rc7Merge tag 'v7.0-rc7' to get fixes that make my CI happier. List of files: /linux/arch/arm64/kernel/Makefile

322e4116ac8d48255f9599250347f48e56ce8979 - Merge v7.0-rc7 into drm-next

Tue, 07 Apr 2026 12:27:36 +0200

Merge v7.0-rc7 into drm-nextThomas Zimmermann needs 2f42c1a61616 ("drm/ast: dp501: Fixinitialization of SCU2C") for drm-misc-next.Conflicts:- drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.cJust between e927b36ae18b ("drm/amd/display: Fix NULL pointerdereference in dcn401_init_hw()") and it's cherry-pick that confusedgit.- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.cDeleted in 6b0a6116286e ("drm/amd/pm: Unify version check in SMUv11")but some cherry-picks confused git. Same for v12/v14.Signed-off-by: Simona Vetter List of files: /linux/arch/arm64/kernel/Makefile

3723393cc284e09107c0f55c47458b75b29be2c3 - Merge tag 'v7.0-rc7' into usb-next

Mon, 06 Apr 2026 09:06:39 +0200

Merge tag 'v7.0-rc7' into usb-nextWe need the USB fixes in here to build on and for testingSigned-off-by: Greg Kroah-Hartman List of files: /linux/arch/arm64/kernel/Makefile

8e06d04ff1cf764066c62e5677bfb0b0c1d1fbbc - arm64: mpam: Context switch the MPAM registers

Fri, 13 Mar 2026 15:45:43 +0100

arm64: mpam: Context switch the MPAM registersMPAM allows traffic in the SoC to be labeled by the OS, these labels areused to apply policy in caches and bandwidth regulators, and to monitortraffic in the SoC. The label is made up of a PARTID and PMG value. The x86equivalent calls these CLOSID and RMID, but they don't map precisely.MPAM has two CPU system registers that is used to hold the PARTID and PMGvalues that traffic generated at each exception level will use. These canbe set per-task by the resctrl file system. (resctrl is the defactointerface for controlling this stuff).Add a helper to switch this.struct task_struct's separate CLOSID and RMID fields are insufficient toimplement resctrl using MPAM, as resctrl can change the PARTID (CLOSID) andPMG (sort of like the RMID) separately. On x86, the rmid is an independentnumber, so a race that writes a mismatched closid and rmid into hardware isbenign. On arm64, the pmg bits extend the partid.(i.e. partid-5 has a pmg-0 that is not the same as partid-6's pmg-0). Inthis case, mismatching the values will 'dirty' a pmg value that resctrlbelieves is clean, and is not tracking with its 'limbo' code.To avoid this, the partid and pmg are always read and written as apair. This requires a new u64 field. In struct task_struct there are twou32, rmid and closid for the x86 case, but as we can't use them here dosomething else. Add this new field, mpam_partid_pmg, to struct thread_infoto avoid adding more architecture specific code to struct task_struct.Always use READ_ONCE()/WRITE_ONCE() when accessing this field.Resctrl allows a per-cpu 'default' value to be set, this overrides thevalues when scheduling a task in the default control-group, which hasPARTID 0. The way 'code data prioritisation' gets emulated means theregister value for the default group needs to be a variable.The current system register value is kept in a per-cpu variable to avoidwriting to the system register if the value isn't going to change. Writesto this register may reset the hardware state for regulating bandwidth.Finally, there is no reason to context switch these registers unless thereis a driver changing the values in struct task_struct. Hide the whole thingbehind a static key. This also allows the driver to disable MPAM inresponse to errors reported by hardware. Move the existing static key tobelong to the arch code, as in the future the MPAM driver may become aloadable module.All this should depend on whether there is an MPAM driver, hide it behindCONFIG_ARM64_MPAM.Tested-by: Gavin Shan Tested-by: Shaopeng Tan Tested-by: Peter Newman Tested-by: Zeng Heng Tested-by: Punit Agrawal Tested-by: Jesse Chick CC: Amit Singh Tomar Reviewed-by: Zeng Heng Reviewed-by: Shaopeng Tan Reviewed-by: Jonathan Cameron Reviewed-by: Gavin Shan Reviewed-by: Catalin Marinas Co-developed-by: Ben Horgan Signed-off-by: Ben Horgan Signed-off-by: James Morse List of files: /linux/arch/arm64/kernel/Makefile

00afb1811fa638dacf125dd1c343b7a181624dfd - Merge tag 'asoc-fix-v7.0-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Thu, 09 Apr 2026 07:00:53 +0200

Merge tag 'asoc-fix-v7.0-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v7.0A somewhat larger set of fixes than I'd like unfortunatey, not from anyone place but rather spread out over different drivers. We've got abunch more fixes for the SDCA interrupt support, several relativelyminor SOF fixes, a few more driver specific fixes and a couple more AMDquirks. List of files: /linux/arch/arm64/kernel/Makefile

441c63ff42c4e666304cdd32d23b5fc6bc1ea3cc - Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Fri, 03 Apr 2026 17:47:13 +0200

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linuxPull arm64 fix from Will Deacon: - Implement a basic static call trampoline to fix CFI failures with the generic implementation* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: Use static call trampolines when kCFI is enabled List of files: /linux/arch/arm64/kernel/Makefile

54ac9ff8f1196afc49d644a1625e0af1c9fcf7f5 - arm64: Use static call trampolines when kCFI is enabled

Tue, 31 Mar 2026 13:04:23 +0200

arm64: Use static call trampolines when kCFI is enabledImplement arm64 support for the 'unoptimized' static call variety, whichroutes all calls through a trampoline that performs a tail call to thechosen function, and wire it up for use when kCFI is enabled. This worksaround an issue with kCFI and generic static calls, where the prototypesof default handlers such as __static_call_nop() and __static_call_ret0()don't match the expected prototype of the call site, resulting in kCFIfalse positives [0].Since static call targets may be located in modules loaded out of directbranching range, this needs an ADRP/LDR pair to load the branch targetinto R16 and a branch-to-register (BR) instruction to perform anindirect call.Unlike on x86, there is no pressing need on arm64 to avoid indirectcalls at all cost, but hiding it from the compiler as is done here doeshave some benefits:- the literal is located in .rodata, which gives us the same robustness advantage that code patching does;- no D-cache pollution from fetching hash values from .text sections.From an execution speed PoV, this is unlikely to make any difference atall.Cc: Sami Tolvanen Cc: Sean Christopherson Cc: Kees Cook Cc: Peter Zijlstra Cc: Will McVicker Reported-by: Carlos Llamas Closes: https://lore.kernel.org/all/20260311225822.1565895-1-cmllamas@google.com/ [0]Signed-off-by: Ard Biesheuvel Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas List of files: /linux/arch/arm64/kernel/Makefile

cb9f145f638d7afa633632a9290d6ad06caeb8ee - Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark

Sat, 01 Nov 2025 13:47:30 +0100

Merge remote-tracking branch 'drm/drm-next' into msm-next-robclarkBack-merge drm-next to get caught up.Signed-off-by: Rob Clark List of files: /linux/arch/arm64/kernel/Makefile

f088104d837a991c65e51fa30bb4196169b3244d - Merge drm/drm-next into drm-intel-gt-next

Tue, 16 Sep 2025 12:53:20 +0200

Merge drm/drm-next into drm-intel-gt-nextBackmerge in order to get the commit: 048832a3f400 ("drm/i915: Refactor shmem_pwrite() to use kiocb and write_iter")To drm-intel-gt-next as there are followup fixes to be applied.Signed-off-by: Joonas Lahtinen List of files: /linux/arch/arm64/kernel/Makefile

a53d0cf7f1cb3182ad533ff5cacfa5fd29c419ad - Merge commit 'linus' into core/bugs, to resolve conflicts

Tue, 05 Aug 2025 11:15:34 +0200

Merge commit 'linus' into core/bugs, to resolve conflictsResolve conflicts with this commit that was developed in parallelduring the merge window: 8c8efa93db68 ("x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust") Conflicts: arch/riscv/include/asm/bug.h arch/x86/include/asm/bug.hSigned-off-by: Ingo Molnar List of files: /linux/arch/arm64/kernel/Makefile

8b87f67b4c87452e21721887fa8dec1f4c6b2b7c - Merge branch 'next' into for-linus

Wed, 08 Oct 2025 06:53:13 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.18 merge window. List of files: /linux/arch/arm64/kernel/Makefile