Merge airlied/drm-next into drm-intel-next-queued

Chris requested this backmerge for a reconciliation on drm_print.h between drm-misc-next and drm-intel-next-queued Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
2026-11-10 20:48:12 +00:00 · 2017-12-08 10:15:30 -08:00 · 2017-12-08 10:15:30 -08:00 · 6647852abc
commit 6647852abc
parent 3e72be177c 3f1f0b1c57
22905 changed files with 1156808 additions and 894869 deletions
--- a/include/uapi/asm-generic/bitsperlong.h
+++ b/include/uapi/asm-generic/bitsperlong.h
--- a/include/uapi/asm-generic/errno-base.h
+++ b/include/uapi/asm-generic/errno-base.h
--- a/include/uapi/asm-generic/errno.h
+++ b/include/uapi/asm-generic/errno.h
--- a/include/uapi/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
--- a/include/uapi/asm-generic/int-l64.h
+++ b/include/uapi/asm-generic/int-l64.h
--- a/include/uapi/asm-generic/int-ll64.h
+++ b/include/uapi/asm-generic/int-ll64.h
--- a/include/uapi/asm-generic/ioctl.h
+++ b/include/uapi/asm-generic/ioctl.h
--- a/include/uapi/asm-generic/ioctls.h
+++ b/include/uapi/asm-generic/ioctls.h
--- a/include/uapi/asm-generic/ipcbuf.h
+++ b/include/uapi/asm-generic/ipcbuf.h
--- a/include/uapi/asm-generic/mman-common.h
+++ b/include/uapi/asm-generic/mman-common.h
--- a/include/uapi/asm-generic/mman.h
+++ b/include/uapi/asm-generic/mman.h
--- a/include/uapi/asm-generic/msgbuf.h
+++ b/include/uapi/asm-generic/msgbuf.h
--- a/include/uapi/asm-generic/param.h
+++ b/include/uapi/asm-generic/param.h
--- a/include/uapi/asm-generic/poll.h
+++ b/include/uapi/asm-generic/poll.h
--- a/include/uapi/asm-generic/posix_types.h
+++ b/include/uapi/asm-generic/posix_types.h
--- a/include/uapi/asm-generic/resource.h
+++ b/include/uapi/asm-generic/resource.h
--- a/include/uapi/asm-generic/sembuf.h
+++ b/include/uapi/asm-generic/sembuf.h
--- a/include/uapi/asm-generic/setup.h
+++ b/include/uapi/asm-generic/setup.h
--- a/include/uapi/asm-generic/shmbuf.h
+++ b/include/uapi/asm-generic/shmbuf.h
--- a/include/uapi/asm-generic/shmparam.h
+++ b/include/uapi/asm-generic/shmparam.h
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
--- a/include/uapi/asm-generic/signal-defs.h
+++ b/include/uapi/asm-generic/signal-defs.h
--- a/include/uapi/asm-generic/signal.h
+++ b/include/uapi/asm-generic/signal.h
--- a/include/uapi/asm-generic/socket.h
+++ b/include/uapi/asm-generic/socket.h
--- a/include/uapi/asm-generic/sockios.h
+++ b/include/uapi/asm-generic/sockios.h
--- a/include/uapi/asm-generic/stat.h
+++ b/include/uapi/asm-generic/stat.h
--- a/include/uapi/asm-generic/statfs.h
+++ b/include/uapi/asm-generic/statfs.h
--- a/include/uapi/asm-generic/swab.h
+++ b/include/uapi/asm-generic/swab.h
--- a/include/uapi/asm-generic/termbits.h
+++ b/include/uapi/asm-generic/termbits.h
--- a/include/uapi/asm-generic/termios.h
+++ b/include/uapi/asm-generic/termios.h
--- a/include/uapi/asm-generic/types.h
+++ b/include/uapi/asm-generic/types.h
--- a/include/uapi/asm-generic/ucontext.h
+++ b/include/uapi/asm-generic/ucontext.h
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
--- a/include/uapi/drm/armada_drm.h
+++ b/include/uapi/drm/armada_drm.h
--- a/include/uapi/drm/etnaviv_drm.h
+++ b/include/uapi/drm/etnaviv_drm.h
--- a/include/uapi/drm/exynos_drm.h
+++ b/include/uapi/drm/exynos_drm.h
--- a/include/uapi/drm/i810_drm.h
+++ b/include/uapi/drm/i810_drm.h
--- a/include/uapi/drm/omap_drm.h
+++ b/include/uapi/drm/omap_drm.h
--- a/include/uapi/linux/a.out.h
+++ b/include/uapi/linux/a.out.h
--- a/include/uapi/linux/acct.h
+++ b/include/uapi/linux/acct.h
--- a/include/uapi/linux/adb.h
+++ b/include/uapi/linux/adb.h
--- a/include/uapi/linux/adfs_fs.h
+++ b/include/uapi/linux/adfs_fs.h
--- a/include/uapi/linux/affs_hardblocks.h
+++ b/include/uapi/linux/affs_hardblocks.h
--- a/include/uapi/linux/am437x-vpfe.h
+++ b/include/uapi/linux/am437x-vpfe.h
--- a/include/uapi/linux/android/binder.h
+++ b/include/uapi/linux/android/binder.h
--- a/include/uapi/linux/apm_bios.h
+++ b/include/uapi/linux/apm_bios.h
--- a/include/uapi/linux/arcfb.h
+++ b/include/uapi/linux/arcfb.h
--- a/include/uapi/linux/aspeed-lpc-ctrl.h
+++ b/include/uapi/linux/aspeed-lpc-ctrl.h
--- a/include/uapi/linux/atalk.h
+++ b/include/uapi/linux/atalk.h
--- a/include/uapi/linux/atm.h
+++ b/include/uapi/linux/atm.h
--- a/include/uapi/linux/atm_eni.h
+++ b/include/uapi/linux/atm_eni.h
--- a/include/uapi/linux/atm_he.h
+++ b/include/uapi/linux/atm_he.h
--- a/include/uapi/linux/atm_idt77105.h
+++ b/include/uapi/linux/atm_idt77105.h
--- a/include/uapi/linux/atm_nicstar.h
+++ b/include/uapi/linux/atm_nicstar.h
--- a/include/uapi/linux/atm_tcp.h
+++ b/include/uapi/linux/atm_tcp.h
--- a/include/uapi/linux/atm_zatm.h
+++ b/include/uapi/linux/atm_zatm.h
--- a/include/uapi/linux/atmapi.h
+++ b/include/uapi/linux/atmapi.h
--- a/include/uapi/linux/atmarp.h
+++ b/include/uapi/linux/atmarp.h
--- a/include/uapi/linux/atmbr2684.h
+++ b/include/uapi/linux/atmbr2684.h
--- a/include/uapi/linux/atmclip.h
+++ b/include/uapi/linux/atmclip.h
--- a/include/uapi/linux/atmdev.h
+++ b/include/uapi/linux/atmdev.h
--- a/include/uapi/linux/atmioc.h
+++ b/include/uapi/linux/atmioc.h
--- a/include/uapi/linux/atmlec.h
+++ b/include/uapi/linux/atmlec.h
--- a/include/uapi/linux/atmmpc.h
+++ b/include/uapi/linux/atmmpc.h
--- a/include/uapi/linux/atmppp.h
+++ b/include/uapi/linux/atmppp.h
--- a/include/uapi/linux/atmsap.h
+++ b/include/uapi/linux/atmsap.h
--- a/include/uapi/linux/atmsvc.h
+++ b/include/uapi/linux/atmsvc.h
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
--- a/include/uapi/linux/auto_dev-ioctl.h
+++ b/include/uapi/linux/auto_dev-ioctl.h
--- a/include/uapi/linux/auto_fs.h
+++ b/include/uapi/linux/auto_fs.h
--- a/include/uapi/linux/auto_fs4.h
+++ b/include/uapi/linux/auto_fs4.h
--- a/include/uapi/linux/auxvec.h
+++ b/include/uapi/linux/auxvec.h
--- a/include/uapi/linux/ax25.h
+++ b/include/uapi/linux/ax25.h
--- a/include/uapi/linux/b1lli.h
+++ b/include/uapi/linux/b1lli.h
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
--- a/include/uapi/linux/baycom.h
+++ b/include/uapi/linux/baycom.h
--- a/include/uapi/linux/bcache.h
+++ b/include/uapi/linux/bcache.h
--- a/include/uapi/linux/bcm933xx_hcs.h
+++ b/include/uapi/linux/bcm933xx_hcs.h
--- a/include/uapi/linux/bfs_fs.h
+++ b/include/uapi/linux/bfs_fs.h
--- a/include/uapi/linux/binfmts.h
+++ b/include/uapi/linux/binfmts.h
--- a/include/uapi/linux/blkpg.h
+++ b/include/uapi/linux/blkpg.h
--- a/include/uapi/linux/blktrace_api.h
+++ b/include/uapi/linux/blktrace_api.h
--- a/include/uapi/linux/blkzoned.h
+++ b/include/uapi/linux/blkzoned.h
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/bpf_common.h
+++ b/include/uapi/linux/bpf_common.h
--- a/include/uapi/linux/bpf_perf_event.h
+++ b/include/uapi/linux/bpf_perf_event.h
--- a/include/uapi/linux/bpqether.h
+++ b/include/uapi/linux/bpqether.h
--- a/include/uapi/linux/bsg.h
+++ b/include/uapi/linux/bsg.h
--- a/include/uapi/linux/bt-bmc.h
+++ b/include/uapi/linux/bt-bmc.h
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
--- a/include/uapi/linux/btrfs_tree.h
+++ b/include/uapi/linux/btrfs_tree.h
--- a/include/uapi/linux/byteorder/big_endian.h
+++ b/include/uapi/linux/byteorder/big_endian.h
--- a/include/uapi/linux/byteorder/little_endian.h
+++ b/include/uapi/linux/byteorder/little_endian.h
--- a/include/uapi/linux/caif/caif_socket.h
+++ b/include/uapi/linux/caif/caif_socket.h
--- a/include/uapi/linux/caif/if_caif.h
+++ b/include/uapi/linux/caif/if_caif.h
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
--- a/include/uapi/linux/can/bcm.h
+++ b/include/uapi/linux/can/bcm.h
--- a/include/uapi/linux/can/error.h
+++ b/include/uapi/linux/can/error.h
--- a/include/uapi/linux/can/gw.h
+++ b/include/uapi/linux/can/gw.h
--- a/Show more
+++ b/Show more