Merge branch 'linus' into x86/entry, to resolve conflicts

Documentation/ABI/testing/dev-kmsg

Documentation/ABI/testing/sysfs-bus-papr-pmem

Documentation/arm64/sve.rst

...ation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml

Documentation/driver-api/media/v4l2-subdev.rst

Documentation/filesystems/dax.txt

Documentation/filesystems/ext4/verity.rst

Documentation/gpu/amdgpu.rst

Documentation/i2c/smbus-protocol.rst

Documentation/powerpc/papr_hcalls.rst

Documentation/sh/index.rst

Documentation/userspace-api/media/conf_nitpick.py

MAINTAINERS

Makefile

arch/arm/kernel/ftrace.c

arch/arm/kernel/kgdb.c

arch/arm/kernel/traps.c

arch/arm/mm/alignment.c

arch/arm64/Kconfig

arch/arm64/Kconfig.debug