mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-15 19:56:03 +00:00
Merge commit 'linus' into core/bugs, to resolve conflicts
Resolve conflicts with this commit that was developed in parallel
during the merge window:
8c8efa93db ("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>
This commit is contained in:
commit
a53d0cf7f1
12529 changed files with 627596 additions and 392142 deletions
89
lib/Kconfig
89
lib/Kconfig
34
lib/Makefile
34
lib/Makefile
5
lib/crc/.gitignore
vendored
5
lib/crc/.gitignore
vendored
119
lib/crc/Kconfig
119
lib/crc/Kconfig
126
lib/crc32.c
126
lib/crc32.c
4
lib/crypto/arm/.gitignore
vendored
4
lib/crypto/arm/.gitignore
vendored
4
lib/crypto/arm64/.gitignore
vendored
4
lib/crypto/arm64/.gitignore
vendored
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue