Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-11-13 07:31:07 +00:00 · 2015-10-14 16:05:18 +02:00 · 2015-10-14 16:05:18 +02:00 · c7d77a7980
commit c7d77a7980
parent 0ce423b649 8a53554e12
10362 changed files with 642801 additions and 335127 deletions
--- a/include/acpi/acbuffer.h
+++ b/include/acpi/acbuffer.h
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
--- a/include/acpi/button.h
+++ b/include/acpi/button.h
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
--- a/include/acpi/platform/acenvex.h
+++ b/include/acpi/platform/acenvex.h
--- a/include/acpi/platform/acmsvcex.h
+++ b/include/acpi/platform/acmsvcex.h
--- a/include/acpi/platform/acwinex.h
+++ b/include/acpi/platform/acwinex.h
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
--- a/include/asm-generic/atomic-long.h
+++ b/include/asm-generic/atomic-long.h
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
--- a/include/asm-generic/atomic64.h
+++ b/include/asm-generic/atomic64.h
--- a/include/asm-generic/barrier.h
+++ b/include/asm-generic/barrier.h
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
--- a/include/asm-generic/early_ioremap.h
+++ b/include/asm-generic/early_ioremap.h
--- a/include/asm-generic/fixmap.h
+++ b/include/asm-generic/fixmap.h
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
--- a/include/asm-generic/pci_iomap.h
+++ b/include/asm-generic/pci_iomap.h
--- a/include/asm-generic/preempt.h
+++ b/include/asm-generic/preempt.h
--- a/include/asm-generic/qrwlock.h
+++ b/include/asm-generic/qrwlock.h
--- a/include/asm-generic/qspinlock.h
+++ b/include/asm-generic/qspinlock.h
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/asm-generic/word-at-a-time.h
+++ b/include/asm-generic/word-at-a-time.h
--- a/include/crypto/aead.h
+++ b/include/crypto/aead.h
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
--- a/include/crypto/chacha20.h
+++ b/include/crypto/chacha20.h
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
--- a/include/crypto/internal/aead.h
+++ b/include/crypto/internal/aead.h
--- a/include/crypto/internal/geniv.h
+++ b/include/crypto/internal/geniv.h
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
--- a/include/crypto/pkcs7.h
+++ b/include/crypto/pkcs7.h
--- a/include/crypto/poly1305.h
+++ b/include/crypto/poly1305.h
--- a/include/crypto/public_key.h
+++ b/include/crypto/public_key.h
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
--- a/include/crypto/skcipher.h
+++ b/include/crypto/skcipher.h
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
--- a/include/drm/drm_modeset_lock.h
+++ b/include/drm/drm_modeset_lock.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
--- a/include/drm/i915_component.h
+++ b/include/drm/i915_component.h
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
--- a/include/dt-bindings/clock/exynos3250.h
+++ b/include/dt-bindings/clock/exynos3250.h
--- a/include/dt-bindings/clock/exynos5250.h
+++ b/include/dt-bindings/clock/exynos5250.h
--- a/include/dt-bindings/clock/imx6qdl-clock.h
+++ b/include/dt-bindings/clock/imx6qdl-clock.h
--- a/include/dt-bindings/clock/imx6ul-clock.h
+++ b/include/dt-bindings/clock/imx6ul-clock.h
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
--- a/include/dt-bindings/clock/r8a7793-clock.h
+++ b/include/dt-bindings/clock/r8a7793-clock.h
--- a/include/dt-bindings/clock/rk3066a-cru.h
+++ b/include/dt-bindings/clock/rk3066a-cru.h
--- a/include/dt-bindings/clock/rk3188-cru-common.h
+++ b/include/dt-bindings/clock/rk3188-cru-common.h
--- a/include/dt-bindings/clock/rk3188-cru.h
+++ b/include/dt-bindings/clock/rk3188-cru.h
--- a/include/dt-bindings/clock/rk3288-cru.h
+++ b/include/dt-bindings/clock/rk3288-cru.h
--- a/include/dt-bindings/clock/rk3368-cru.h
+++ b/include/dt-bindings/clock/rk3368-cru.h
--- a/include/dt-bindings/clock/zx296702-clock.h
+++ b/include/dt-bindings/clock/zx296702-clock.h
--- a/include/dt-bindings/dma/axi-dmac.h
+++ b/include/dt-bindings/dma/axi-dmac.h
--- a/include/dt-bindings/dma/jz4780-dma.h
+++ b/include/dt-bindings/dma/jz4780-dma.h
--- a/include/dt-bindings/i2c/i2c.h
+++ b/include/dt-bindings/i2c/i2c.h
--- a/include/dt-bindings/leds/leds-ns2.h
+++ b/include/dt-bindings/leds/leds-ns2.h
--- a/include/dt-bindings/media/c8sectpfe.h
+++ b/include/dt-bindings/media/c8sectpfe.h
--- a/include/dt-bindings/memory/tegra210-mc.h
+++ b/include/dt-bindings/memory/tegra210-mc.h
--- a/include/dt-bindings/mfd/st-lpc.h
+++ b/include/dt-bindings/mfd/st-lpc.h
--- a/include/dt-bindings/pinctrl/am43xx.h
+++ b/include/dt-bindings/pinctrl/am43xx.h
--- a/include/dt-bindings/pinctrl/dra.h
+++ b/include/dt-bindings/pinctrl/dra.h
--- a/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
+++ b/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
--- a/include/dt-bindings/power/mt8173-power.h
+++ b/include/dt-bindings/power/mt8173-power.h
--- a/include/dt-bindings/reset/altr,rst-mgr-a10.h
+++ b/include/dt-bindings/reset/altr,rst-mgr-a10.h
--- a/include/dt-bindings/reset-controller/stih407-resets.h
+++ b/include/dt-bindings/reset-controller/stih407-resets.h
--- a/include/dt-bindings/reset-controller/stih415-resets.h
+++ b/include/dt-bindings/reset-controller/stih415-resets.h
--- a/include/dt-bindings/reset-controller/stih416-resets.h
+++ b/include/dt-bindings/reset-controller/stih416-resets.h
--- a/include/dt-bindings/reset/tegra124-car.h
+++ b/include/dt-bindings/reset/tegra124-car.h
--- a/include/keys/system_keyring.h
+++ b/include/keys/system_keyring.h
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/asn1_ber_bytecode.h
+++ b/include/linux/asn1_ber_bytecode.h
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/atmel_serial.h
+++ b/include/linux/atmel_serial.h
--- a/include/linux/atomic.h
+++ b/include/linux/atomic.h
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
--- a/include/linux/average.h
+++ b/include/linux/average.h
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/Show more
+++ b/Show more