projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed845c3 352af6a)
Merge commit 'linus' into core/bugs, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 5 Aug 2025 09:15:34 +0000 (11:15 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 5 Aug 2025 09:15:34 +0000 (11:15 +0200)
commita53d0cf7f1cb3182ad533ff5cacfa5fd29c419ad
tree59bd9bad63a1460a6079162fca98ea47f5a81679tree
parented845c363d8c93eeaad4ce48bb7d5f81b6a75b61commit | diff
parent352af6a011d586ff042db4b2d1f7421875eb8a14commit | diff
Merge commit 'linus' into core/bugs, to resolve conflicts

Resolve conflicts with this commit that was developed in parallel
during 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.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/riscv/include/asm/bug.h diff1 | diff2 | blob | history
arch/x86/include/asm/bug.h diff1 | diff2 | blob | history
kernel/panic.c diff1 | diff2 | blob | history
lib/Kconfig.debug diff1 | diff2 | blob | history
MicroBlaze GIT Repository