Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc-next

Resync with drm-next, I have a patch which currently can't be applied because drm-misc-next lacked the latest drm/i915 code. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2026-11-13 07:31:07 +00:00 · 2017-03-23 08:15:55 +01:00 · 2017-03-23 08:15:55 +01:00 · 628d4c46ee
commit 628d4c46ee
parent 1e797f556c 65d1086c44
969 changed files with 38244 additions and 16254 deletions
--- a/include/asm-generic/4level-fixup.h
+++ b/include/asm-generic/4level-fixup.h
--- a/include/asm-generic/5level-fixup.h
+++ b/include/asm-generic/5level-fixup.h
--- a/include/asm-generic/pgtable-nop4d-hack.h
+++ b/include/asm-generic/pgtable-nop4d-hack.h
--- a/include/asm-generic/pgtable-nop4d.h
+++ b/include/asm-generic/pgtable-nop4d.h
--- a/include/asm-generic/pgtable-nopud.h
+++ b/include/asm-generic/pgtable-nopud.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
--- a/include/dt-bindings/sound/cs42l42.h
+++ b/include/dt-bindings/sound/cs42l42.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
--- a/include/linux/list_nulls.h
+++ b/include/linux/list_nulls.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/net.h
+++ b/include/linux/net.h
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
--- a/include/linux/purgatory.h
+++ b/include/linux/purgatory.h
--- a/include/linux/random.h
+++ b/include/linux/random.h
--- a/include/linux/rculist_nulls.h
+++ b/include/linux/rculist_nulls.h
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
--- a/include/linux/userfaultfd_k.h
+++ b/include/linux/userfaultfd_k.h
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
--- a/include/media/vsp1.h
+++ b/include/media/vsp1.h
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
--- a/include/net/irda/timer.h
+++ b/include/net/irda/timer.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
--- a/include/trace/events/syscalls.h
+++ b/include/trace/events/syscalls.h
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
--- a/include/uapi/drm/omap_drm.h
+++ b/include/uapi/drm/omap_drm.h
--- a/include/uapi/linux/packet_diag.h
+++ b/include/uapi/linux/packet_diag.h
--- a/include/uapi/linux/userfaultfd.h
+++ b/include/uapi/linux/userfaultfd.h
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
--- a/include/xen/swiotlb-xen.h
+++ b/include/xen/swiotlb-xen.h