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

# Conflicts:
#	include/linux/seqlock.h

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arc/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/coco/sev/core.c
Simple merge

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc arch/x86/pci/fixup.c
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/idle/intel_idle.c
Simple merge

diff --cc drivers/iommu/amd/init.c
Simple merge

diff --cc drivers/iommu/amd/iommu.c
Simple merge

diff --cc drivers/iommu/intel/irq_remapping.c
Simple merge

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/mm_types.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/stats.h
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/gup.c
Simple merge