History

Merge tag 'v4.11-rc7' into drm-next

Backmerge Linux 4.11-rc7 from Linus tree, to fix some conflicts that were causing problems with the rerere cache in drm-tip.

Dave Airlie committed 9 years ago

Commit 856ee922 parents a6a5c98 4f7d029178 files · +1991 −1078Browse files

Showing the changes to include/uapi/linux (2 of 178 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
445header-y += unix_diag.h445header-y += unix_diag.h
446header-y += usbdevice_fs.h446header-y += usbdevice_fs.h
447header-y += usbip.h447header-y += usbip.h
448header-y += userio.h
448header-y += utime.h449header-y += utime.h
449header-y += utsname.h450header-y += utsname.h
450header-y += uuid.h451header-y += uuid.h
include/uapi/linux/virtio_pci.h+1−1
@@ -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 085#define VIRTIO_PCI_ABI_VERSION 0