Backmerge the main drm-next pull to sync up. Chris also pointed out that commit ade0b0c965f59176daddbef9c4717354034f9bce Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Sat Apr 22 09:15:37 2017 +0100 drm/i915: Confirm the request is still active before adding it to the await is double-applied in the git merge, so make sure we get this right.
Showing the changes to include/uapi (2 of 240 files). Show all
Unified · Split
| @@ -445,6 +445,7 @@ header-y += unistd.h · 444 unmodified lines | |||
| 445 | header-y += unix_diag.h | 445 | header-y += unix_diag.h |
| 446 | header-y += usbdevice_fs.h | 446 | header-y += usbdevice_fs.h |
| 447 | header-y += usbip.h | 447 | header-y += usbip.h |
| 448 | header-y += userio.h | ||
| 448 | header-y += utime.h | 449 | header-y += utime.h |
| 449 | header-y += utsname.h | 450 | header-y += utsname.h |
| 450 | header-y += uuid.h | 451 | header-y += uuid.h |
| @@ -79,7 +79,7 @@ · 78 unmodified lines | |||
| 79 | * configuration space */ | 79 | * configuration space */ |
| 80 | #define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20) | 80 | #define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20) |
| 81 | /* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */ | 81 | /* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */ |
| 82 | #define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->pci_dev->msix_enabled) | 82 | #define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->msix_enabled) |
| 83 | 83 | ||
| 84 | /* Virtio ABI version, this must match exactly */ | 84 | /* Virtio ABI version, this must match exactly */ |
| 85 | #define VIRTIO_PCI_ABI_VERSION 0 | 85 | #define VIRTIO_PCI_ABI_VERSION 0 |