History

Merge tag 'tags/drm-for-v4.12' into drm-intel-next-queued

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.

Daniel Vetter committed 9 years ago

Commit ad15f742 parents 8a2d6ae 8b03d1e240 files · +4749 −1355Browse files

Showing the changes to include/uapi (2 of 240 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/virtio_pci.h +1 −1
include/uapi/linux/Kbuild+1−0
@@ -445,6 +445,7 @@ header-y += unistd.h · 444 unmodified lines
445445 header-y += unix_diag.h
446446 header-y += usbdevice_fs.h
447447 header-y += usbip.h
448+header-y += userio.h
448449 header-y += utime.h
449450 header-y += utsname.h
450451 header-y += uuid.h
include/uapi/linux/virtio_pci.h+1−1
@@ -79,7 +79,7 @@ · 78 unmodified lines
7979 * configuration space */
8080 #define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20)
8181 /* 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)
8383
8484 /* Virtio ABI version, this must match exactly */
8585 #define VIRTIO_PCI_ABI_VERSION 0

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t