Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards, due to API changes in the regulator tree. I've included the patch into the merge to fix the build. Signed-off-by: Dave Airlie <airlied@redhat.com>
2026-11-13 07:31:07 +00:00 · 2015-04-20 11:32:26 +10:00 · 2015-04-20 11:32:26 +10:00 · 2c33ce009c
commit 2c33ce009c
parent cec32a4701 09d51602cf
6862 changed files with 304598 additions and 165729 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.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/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/asm-generic/seccomp.h
+++ b/include/asm-generic/seccomp.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
--- a/include/crypto/rng.h
+++ b/include/crypto/rng.h
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
--- a/include/crypto/sha1_base.h
+++ b/include/crypto/sha1_base.h
--- a/include/crypto/sha256_base.h
+++ b/include/crypto/sha256_base.h
--- a/include/crypto/sha512_base.h
+++ b/include/crypto/sha512_base.h
--- a/include/dt-bindings/clock/pistachio-clk.h
+++ b/include/dt-bindings/clock/pistachio-clk.h
--- a/include/dt-bindings/gpio/meson8b-gpio.h
+++ b/include/dt-bindings/gpio/meson8b-gpio.h
--- a/include/dt-bindings/interrupt-controller/irq-st.h
+++ b/include/dt-bindings/interrupt-controller/irq-st.h
--- a/include/dt-bindings/leds/common.h
+++ b/include/dt-bindings/leds/common.h
--- a/include/dt-bindings/mfd/arizona.h
+++ b/include/dt-bindings/mfd/arizona.h
--- a/include/dt-bindings/mfd/qcom-rpm.h
+++ b/include/dt-bindings/mfd/qcom-rpm.h
--- a/include/dt-bindings/phy/phy-miphy365x.h
+++ b/include/dt-bindings/phy/phy-miphy365x.h
--- a/include/dt-bindings/pinctrl/mt65xx.h
+++ b/include/dt-bindings/pinctrl/mt65xx.h
--- a/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
+++ b/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
--- a/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
+++ b/include/dt-bindings/pinctrl/qcom,pmic-mpp.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/kvm/iodev.h
+++ b/include/kvm/iodev.h
--- a/include/linux/a.out.h
+++ b/include/linux/a.out.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/bcm47xx_nvram.h
+++ b/include/linux/bcm47xx_nvram.h
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
--- a/include/linux/bcma/bcma_driver_gmac_cmn.h
+++ b/include/linux/bcma/bcma_driver_gmac_cmn.h
--- a/include/linux/bcma/bcma_driver_mips.h
+++ b/include/linux/bcma/bcma_driver_mips.h
--- a/include/linux/bcma/bcma_driver_pci.h
+++ b/include/linux/bcma/bcma_driver_pci.h
--- a/include/linux/bcma/bcma_driver_pcie2.h
+++ b/include/linux/bcma/bcma_driver_pcie2.h
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
--- a/include/linux/can/led.h
+++ b/include/linux/can/led.h
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
--- a/include/linux/cleancache.h
+++ b/include/linux/cleancache.h
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
--- a/include/linux/context_tracking_state.h
+++ b/include/linux/context_tracking_state.h
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
--- a/include/linux/devfreq-event.h
+++ b/include/linux/devfreq-event.h
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
--- a/include/linux/dmapool.h
+++ b/include/linux/dmapool.h
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
--- a/include/linux/elf-randomize.h
+++ b/include/linux/elf-randomize.h
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fs_pin.h
+++ b/include/linux/fs_pin.h
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/fwnode.h
+++ b/include/linux/fwnode.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
--- a/include/linux/hid-sensor-hub.h
+++ b/include/linux/hid-sensor-hub.h
--- a/include/linux/hid-sensor-ids.h
+++ b/include/linux/hid-sensor-ids.h
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
--- a/include/linux/hsi/hsi.h
+++ b/include/linux/hsi/hsi.h
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
--- a/include/linux/ieee802154.h
+++ b/include/linux/ieee802154.h
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
--- a/include/linux/iio/buffer.h
+++ b/include/linux/iio/buffer.h
--- a/include/linux/iio/dac/max517.h
+++ b/include/linux/iio/dac/max517.h
--- a/include/linux/iio/events.h
+++ b/include/linux/iio/events.h
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
--- a/Show more
+++ b/Show more