to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 | |
| -rw-r--r-- | include/acpi/acpixf.h | 2 | |
| -rw-r--r-- | include/acpi/actypes.h | 3 | |
| -rw-r--r-- | include/acpi/ghes.h | 3 | |
| -rw-r--r-- | include/asm-generic/5level-fixup.h | 58 | |
| -rw-r--r-- | include/asm-generic/Kbuild | 1 | |
| -rw-r--r-- | include/asm-generic/barrier.h | 16 | |
| -rw-r--r-- | include/asm-generic/bug.h | 9 | |
| -rw-r--r-- | include/asm-generic/cacheflush.h | 25 | |
| -rw-r--r-- | include/asm-generic/checksum.h | 9 | |
| -rw-r--r-- | include/asm-generic/hugetlb.h | 2 | |
| -rw-r--r-- | include/asm-generic/hyperv-tlfs.h | 497 | |
| -rw-r--r-- | include/asm-generic/io.h | 66 | |
| -rw-r--r-- | include/asm-generic/mshyperv.h | 2 | |
| -rw-r--r-- | include/asm-generic/pgtable-nop4d-hack.h | 64 | |
| -rw-r--r-- | include/asm-generic/pgtable-nopmd.h | 1 | |
| -rw-r--r-- | include/asm-generic/pgtable-nopud.h | 5 | |
| -rw-r--r-- | include/asm-generic/sections.h | 3 | |
| -rw-r--r-- | include/asm-generic/topology.h | 2 | |
| -rw-r--r-- | include/asm-generic/vermagic.h | 7 | |
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 10 | |
| -rw-r--r-- | include/crypto/acompress.h | 2 | |
| -rw-r--r-- | include/crypto/algapi.h | 2 | |
| -rw-r--r-- | include/crypto/drbg.h | 6 | |
| -rw-r--r-- | include/crypto/engine.h | 15 | |
| -rw-r--r-- | include/crypto/hash.h | 19 | |
| -rw-r--r-- | include/crypto/sha.h | 28 | |
| -rw-r--r-- | include/crypto/sha256_base.h | 6 | |
| -rw-r--r-- | include/drm/drm_client.h | 4 | |
| -rw-r--r-- | include/drm/drm_connector.h | 4 | |
| -rw-r--r-- | include/drm/drm_debugfs.h | 16 | |
| -rw-r--r-- | include/drm/drm_device.h | 24 | |
| -rw-r--r-- | include/drm/drm_displayid.h | 2 | |
| -rw-r--r-- | include/drm/drm_dp_helper.h | 177 | |
| -rw-r--r-- | include/drm/drm_dp_mst_helper.h | 86 | |
| -rw-r--r-- | include/drm/drm_drv.h | 44 | |
| -rw-r--r-- | include/drm/drm_encoder.h | 8 | |
| -rw-r--r-- | include/drm/drm_fb_helper.h | 6 | |
| -rw-r--r-- | include/drm/drm_file.h | 11 | |
| -rw-r--r-- | include/drm/drm_framebuffer.h | 38 | |
| -rw-r--r-- | include/drm/drm_gem_framebuffer_helper.h | 15 | |
| -rw-r--r-- | include/drm/drm_gem_vram_helper.h | 2 | |
| -rw-r--r-- | include/drm/drm_legacy.h | 15 | |
| -rw-r--r-- | include/drm/drm_managed.h | 109 | |
| -rw-r--r-- | include/drm/drm_mipi_dbi.h | 8 | |
| -rw-r--r-- | include/drm/drm_mm.h | 1 | |
| -rw-r--r-- | include/drm/drm_mode_config.h | 18 | |
| -rw-r--r-- | include/drm/drm_modes.h | 13 | |
| -rw-r--r-- | include/drm/drm_modeset_helper_vtables.h | 27 | |
| -rw-r--r-- | include/drm/drm_pci.h | 63 | |
| -rw-r--r-- | include/drm/drm_print.h | 6 | |
| -rw-r--r-- | include/drm/drm_writeback.h | 9 | |
| -rw-r--r-- | include/drm/gpu_scheduler.h | 1 | |
| -rw-r--r-- | include/drm/i915_pciids.h | 8 | |
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 4 | |
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 1 | |
| -rw-r--r-- | include/drm/ttm/ttm_debug.h | 31 | |
| -rw-r--r-- | include/dt-bindings/clock/agilex-clock.h | 70 | |
| -rw-r--r-- | include/dt-bindings/clock/at91.h | 4 | |
| -rw-r--r-- | include/dt-bindings/clock/bt1-ccu.h | 48 | |
| -rw-r--r-- | include/dt-bindings/clock/imx7ulp-clock.h | 5 | |
| -rw-r--r-- | include/dt-bindings/clock/imx8mp-clock.h | 90 | |
| -rw-r--r-- | include/dt-bindings/clock/intel,lgm-clk.h | 165 | |
| -rw-r--r-- | include/dt-bindings/clock/marvell,mmp2-audio.h | 10 | |
| -rw-r--r-- | include/dt-bindings/clock/marvell,mmp2.h | 3 | |
| -rw-r--r-- | include/dt-bindings/clock/meson8b-clkc.h | 1 | |
| -rw-r--r-- | include/dt-bindings/clock/mt6765-clk.h | 313 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,gcc-msm8939.h | 206 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,gcc-msm8998.h | 1 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,gcc-sc7180.h | 1 | |
| -rw-r--r-- | include/dt-bindings/clock/r8a7742-cpg-mssr.h | 42 | |
| -rw-r--r-- | include/dt-bindings/clock/sprd,sc9863a-clk.h | 5 | |
| -rw-r--r-- | include/dt-bindings/clock/tegra114-car.h | 14 | |
| -rw-r--r-- | include/dt-bindings/clock/tegra124-car-common.h | 14 | |
| -rw-r--r-- | include/dt-bindings/clock/tegra20-car.h | 2 | |
| -rw-r--r-- | include/dt-bindings/clock/tegra210-car.h | 20 | |
| -rw-r--r-- | include/dt-bindings/clock/tegra30-car.h | 14 | |
| -rw-r--r-- | include/dt-bindings/clock/x1000-cgu.h | 64 | |
| -rw-r--r-- | include/dt-bindings/clock/x1830-cgu.h | 55 | |
| -rw-r--r-- | include/dt-bindings/firmware/imx/rsrc.h | 84 | |
| -rw-r--r-- | include/dt-bindings/interconnect/imx8mm.h | 50 | |
| -rw-r--r-- | include/dt-bindings/interconnect/imx8mn.h | 41 | |
| -rw-r--r-- | include/dt-bindings/interconnect/imx8mq.h | 48 | |
| -rw-r--r-- | include/dt-bindings/phy/phy.h | 1 | |
| -rw-r--r-- | include/dt-bindings/pinctrl/pads-imx8dxl.h | 639 | |
| -rw-r--r-- | include/dt-bindings/pinctrl/rockchip.h | 11 | |
| -rw-r--r-- | include/dt-bindings/power/marvell,mmp2.h | 11 | |
| -rw-r--r-- | include/dt-bindings/power/meson-gxbb-power.h | 13 | |
| -rw-r--r-- | include/dt-bindings/power/meson8-power.h | 13 | |
| -rw-r--r-- | include/dt-bindings/power/qcom-rpmpd.h | 12 | |
| -rw-r--r-- | include/dt-bindings/power/r8a7742-sysc.h | 29 | |
| -rw-r--r-- | include/dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 | |
| -rw-r--r-- | include/dt-bindings/reset/bt1-ccu.h | 25 | |
| -rw-r--r-- | include/dt-bindings/reset/imx8mp-reset.h | 50 | |
| -rw-r--r-- | include/dt-bindings/reset/imx8mq-reset.h | 56 | |
| -rw-r--r-- | include/dt-bindings/reset/qcom,gcc-msm8939.h | 110 | |
| -rw-r--r-- | include/dt-bindings/reset/realtek,rtd1195.h | 74 | |
| -rw-r--r-- | include/dt-bindings/reset/realtek,rtd1295.h | 3 | |
| -rw-r--r-- | include/keys/big_key-type.h | 1 | |
| -rw-r--r-- | include/keys/user-type.h | 2 | |
| -rw-r--r-- | include/kunit/test.h | 12 | |
| -rw-r--r-- | include/kvm/arm_vgic.h | 5 | |
| -rw-r--r-- | include/linux/amba/bus.h | 1 | |
| -rw-r--r-- | include/linux/arm-smccc.h | 25 | |
| -rw-r--r-- | include/linux/atomic-arch-fallback.h | 2291 | |
| -rw-r--r-- | include/linux/atomic-fallback.h | 346 | |
| -rw-r--r-- | include/linux/atomic.h | 11 | |
| -rw-r--r-- | include/linux/audit.h | 24 | |
| -rw-r--r-- | include/linux/avf/virtchnl.h | 5 | |
| -rw-r--r-- | include/linux/backing-dev-defs.h | 4 | |
| -rw-r--r-- | include/linux/backing-dev.h | 17 | |
| -rw-r--r-- | include/linux/backlight.h | 1 | |
| -rw-r--r-- | include/linux/bch.h | 11 | |
| -rw-r--r-- | include/linux/binfmts.h | 48 | |
| -rw-r--r-- | include/linux/bio.h | 23 | |
| -rw-r--r-- | include/linux/bitops.h | 2 | |
| -rw-r--r-- | include/linux/blk-cgroup.h | 53 | |
| -rw-r--r-- | include/linux/blk-crypto.h | 123 | |
| -rw-r--r-- | include/linux/blk-mq.h | 16 | |
| -rw-r--r-- | include/linux/blk_types.h | 26 | |
| -rw-r--r-- | include/linux/blkdev.h | 122 | |
| -rw-r--r-- | include/linux/bpf-cgroup.h | 24 | |
| -rw-r--r-- | include/linux/bpf-netns.h | 64 | |
| -rw-r--r-- | include/linux/bpf.h | 122 | |
| -rw-r--r-- | include/linux/bpf_types.h | 11 | |
| -rw-r--r-- | include/linux/bpf_verifier.h | 7 | |
| -rw-r--r-- | include/linux/brcmphy.h | 59 | |
| -rw-r--r-- | include/linux/bsearch.h | 26 | |
| -rw-r--r-- | include/linux/buffer_head.h | 16 | |
| -rw-r--r-- | include/linux/bvec.h | 13 | |
| -rw-r--r-- | include/linux/cache.h | 10 | |
| -rw-r--r-- | include/linux/can/dev/peak_canfd.h | 4 | |
| -rw-r--r-- | include/linux/capability.h | 9 | |
| -rw-r--r-- | include/linux/cdrom.h | 7 | |
| -rw-r--r-- | include/linux/ceph/libceph.h | 13 | |
| -rw-r--r-- | include/linux/ceph/mon_client.h | 2 | |