]> Gentwo Git Trees - linux/.git/commitdiff
Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers...
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2025 06:15:29 +0000 (17:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2025 06:15:29 +0000 (17:15 +1100)
32 files changed:
1  2 
MAINTAINERS
arch/arm/configs/multi_v7_defconfig
arch/arm64/Kconfig
arch/arm64/configs/defconfig
arch/loongarch/Kconfig
arch/loongarch/configs/loongson3_defconfig
arch/m68k/configs/amiga_defconfig
arch/m68k/configs/apollo_defconfig
arch/m68k/configs/atari_defconfig
arch/m68k/configs/bvme6000_defconfig
arch/m68k/configs/hp300_defconfig
arch/m68k/configs/mac_defconfig
arch/m68k/configs/multi_defconfig
arch/m68k/configs/mvme147_defconfig
arch/m68k/configs/mvme16x_defconfig
arch/m68k/configs/q40_defconfig
arch/m68k/configs/sun3_defconfig
arch/m68k/configs/sun3x_defconfig
arch/powerpc/Kconfig
arch/powerpc/configs/ppc64_defconfig
arch/s390/Kconfig
arch/s390/configs/debug_defconfig
arch/s390/configs/defconfig
arch/x86/Kconfig
crypto/Kconfig
crypto/Makefile
drivers/target/iscsi/iscsi_target.c
fs/bcachefs/Kconfig
fs/ext4/super.c
fs/f2fs/f2fs.h
lib/Kconfig.debug
lib/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc crypto/Kconfig
Simple merge
diff --cc crypto/Makefile
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/f2fs/f2fs.h
Simple merge
Simple merge
diff --cc lib/Makefile
Simple merge