History

Backmerge drm-fixes merge into Linus's tree into drm-next.

This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next Just to resolve some merges to make Daniel's life easier.

Dave Airlie committed 10 years ago

Commit 20f8e032 parents ade1ba7 5b726e0529 files · +4211 −2598Browse files

Showing the changes to include/uapi (3 of 529 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/openvswitch.h +1 −1
  3. include/uapi/linux/vfio.h +0 −7
include/uapi/linux/Kbuild+1−0
@@ -186,6 +186,7 @@ header-y += if_tunnel.h · 185 unmodified lines
186header-y += if_vlan.h186header-y += if_vlan.h
187header-y += if_x25.h187header-y += if_x25.h
188header-y += igmp.h188header-y += igmp.h
189header-y += ila.h
189header-y += in6.h190header-y += in6.h
190header-y += inet_diag.h191header-y += inet_diag.h
191header-y += in.h192header-y += in.h
include/uapi/linux/openvswitch.h+1−1
@@ -628,7 +628,7 @@ struct ovs_action_hash { · 627 unmodified lines
628 * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the628 * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the
629 * mask, the corresponding bit in the value is copied to the connection629 * mask, the corresponding bit in the value is copied to the connection
630 * tracking mark field in the connection.630 * tracking mark field in the connection.
631 * @OVS_CT_ATTR_LABEL: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN631 * @OVS_CT_ATTR_LABELS: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN
632 * mask. For each bit set in the mask, the corresponding bit in the value is632 * mask. For each bit set in the mask, the corresponding bit in the value is
633 * copied to the connection tracking label field in the connection.633 * copied to the connection tracking label field in the connection.
634 * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG.634 * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG.
include/uapi/linux/vfio.h+0−7
@@ -38,13 +38,6 @@ · 37 unmodified lines
38 38
39#define VFIO_SPAPR_TCE_v2_IOMMU 739#define VFIO_SPAPR_TCE_v2_IOMMU 7
40 40
41/*
42 * The No-IOMMU IOMMU offers no translation or isolation for devices and
43 * supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU
44 * code will taint the host kernel and should be used with extreme caution.
45 */
46#define VFIO_NOIOMMU_IOMMU 8
47
48/*41/*
49 * The IOCTL interface is designed for extensibility by embedding the42 * The IOCTL interface is designed for extensibility by embedding the
50 * structure length (argsz) and flags into structures passed between43 * structure length (argsz) and flags into structures passed between

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