Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Browse source

Some conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

...

This commit is contained in:

Maarten Lankhorst 2020-06-29 12:15:51 +02:00

parent 84e543bc9d 0a19b068ac

commit 60e9eabf41

15817 changed files with 1034154 additions and 486938 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

include/uapi/asm-generic/unistd.h

View file

19

include/uapi/drm/amdgpu_drm.h

View file

122

include/uapi/drm/drm_fourcc.h

View file

24

include/uapi/drm/i915_drm.h

View file

24

include/uapi/drm/msm_drm.h

View file

1

include/uapi/linux/audit.h

View file

403

include/uapi/linux/bpf.h

View file

10

include/uapi/linux/btrfs.h

View file

9

include/uapi/linux/btrfs_tree.h

View file

42

include/uapi/linux/capability.h

View file

9

include/uapi/linux/devlink.h

View file

6

include/uapi/linux/dma-buf.h

View file

11

include/uapi/linux/elf.h

View file

2

include/uapi/linux/errqueue.h

View file

16

include/uapi/linux/ethtool.h

View file

153

include/uapi/linux/ethtool_netlink.h

View file

10

include/uapi/linux/fcntl.h

View file

26

include/uapi/linux/fd.h

View file

16

include/uapi/linux/fdreg.h

View file

6

include/uapi/linux/fiemap.h

View file

2

include/uapi/linux/firewire-cdev.h

View file

1

include/uapi/linux/fs.h

View file

3

include/uapi/linux/fscrypt.h

View file

2

include/uapi/linux/genetlink.h

View file

6

include/uapi/linux/gfs2_ondisk.h

View file

4

include/uapi/linux/hyperv.h

View file

1

include/uapi/linux/if.h

View file

6

include/uapi/linux/if_arcnet.h

View file

96

include/uapi/linux/if_bridge.h

View file

1

include/uapi/linux/if_ether.h

View file

1

include/uapi/linux/if_link.h

View file

2

include/uapi/linux/if_x25.h

View file

2

include/uapi/linux/inet_diag.h

View file

12

include/uapi/linux/io_uring.h

View file

5

include/uapi/linux/iommu.h

View file

2

include/uapi/linux/keyctl.h

View file

21

include/uapi/linux/kfd_ioctl.h

View file

18

include/uapi/linux/kvm.h

View file

31

include/uapi/linux/loop.h

View file

1

include/uapi/linux/magic.h

View file

2

include/uapi/linux/mii.h

View file

3

include/uapi/linux/mmc/ioctl.h

View file

122

include/uapi/linux/mrp_bridge.h

View file

1

include/uapi/linux/ndctl.h

View file

1

include/uapi/linux/neighbour.h

View file

4

include/uapi/linux/net_dropmon.h

View file

8

include/uapi/linux/netfilter/nf_conntrack_common.h

View file

4

include/uapi/linux/netfilter/nf_nat.h

View file

2

include/uapi/linux/netfilter/nf_tables.h

View file

9

include/uapi/linux/netfilter/nfnetlink_conntrack.h

View file

1

include/uapi/linux/netfilter/xt_IDLETIMER.h

View file

2

include/uapi/linux/netfilter_bridge/ebt_among.h

View file

103

include/uapi/linux/netlink.h

View file

3

include/uapi/linux/nexthop.h

View file

149

include/uapi/linux/nl80211.h

View file

24

include/uapi/linux/pkt_cls.h

View file

6

include/uapi/linux/pkt_sched.h

View file

22

include/uapi/linux/psample.h

View file

2

include/uapi/linux/psp-sev.h

View file

4

include/uapi/linux/ptp_clock.h

View file

1

include/uapi/linux/rtc.h

View file

6

include/uapi/linux/rtnetlink.h

View file

19

include/uapi/linux/stat.h

View file

47

include/uapi/linux/tc_act/tc_gate.h

View file

9

include/uapi/linux/tee.h

View file

108

include/uapi/linux/usb/raw_gadget.h

View file

12

include/uapi/linux/v4l2-controls.h

View file

16

include/uapi/linux/v4l2-subdev.h

View file

322

include/uapi/linux/vfio.h

View file

19

include/uapi/linux/vfio_ccw.h

View file

4

include/uapi/linux/vhost.h

View file

5

include/uapi/linux/videodev2.h

View file

11

include/uapi/linux/virtio_balloon.h

View file

1

include/uapi/linux/virtio_ids.h

View file

211

include/uapi/linux/virtio_mem.h

View file

48

include/uapi/linux/virtio_ring.h

View file

104

include/uapi/linux/watch_queue.h

View file

6

include/uapi/linux/wireless.h

View file

4

include/uapi/linux/xattr.h

View file

2

include/uapi/linux/xfrm.h

View file

245

include/uapi/misc/habanalabs.h

View file

1

include/uapi/mtd/mtd-abi.h

View file

3

include/uapi/rdma/hfi/hfi1_user.h

View file

81

include/uapi/rdma/ib_user_ioctl_cmds.h

View file

43

include/uapi/rdma/ib_user_ioctl_verbs.h

View file

9

include/uapi/rdma/mlx5-abi.h

View file

6

include/uapi/rdma/mlx5_user_ioctl_cmds.h

View file

15

include/uapi/rdma/rdma_user_cm.h

View file

2

include/uapi/rdma/rdma_user_ioctl_cmds.h

View file

2

include/uapi/scsi/scsi_bsg_fc.h

View file

2

include/uapi/sound/skl-tplg-interface.h

View file

2

include/uapi/sound/sof/abi.h

View file

8

include/uapi/sound/sof/tokens.h

View file