Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/loongarch/configs/loongson3_defconfig
Simple merge

diff --cc arch/m68k/configs/amiga_defconfig
Simple merge

diff --cc arch/m68k/configs/apollo_defconfig
Simple merge

diff --cc arch/m68k/configs/atari_defconfig
Simple merge

diff --cc arch/m68k/configs/bvme6000_defconfig
Simple merge

diff --cc arch/m68k/configs/hp300_defconfig
Simple merge

diff --cc arch/m68k/configs/mac_defconfig
Simple merge

diff --cc arch/m68k/configs/multi_defconfig
Simple merge

diff --cc arch/m68k/configs/mvme147_defconfig
Simple merge

diff --cc arch/m68k/configs/mvme16x_defconfig
Simple merge

diff --cc arch/m68k/configs/q40_defconfig
Simple merge

diff --cc arch/m68k/configs/sun3_defconfig
Simple merge

diff --cc arch/m68k/configs/sun3x_defconfig
Simple merge

diff --cc lib/rhashtable.c
Simple merge