This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next Just to resolve some merges to make Daniel's life easier.
Showing the changes to include/uapi (3 of 529 files). Show all
Unified · Split
| @@ -186,6 +186,7 @@ header-y += if_tunnel.h · 185 unmodified lines | ||
| 186 | 186 | header-y += if_vlan.h |
| 187 | 187 | header-y += if_x25.h |
| 188 | 188 | header-y += igmp.h |
| 189 | +header-y += ila.h | |
| 189 | 190 | header-y += in6.h |
| 190 | 191 | header-y += inet_diag.h |
| 191 | 192 | header-y += in.h |
| @@ -628,7 +628,7 @@ struct ovs_action_hash { · 627 unmodified lines | ||
| 628 | 628 | * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the |
| 629 | 629 | * mask, the corresponding bit in the value is copied to the connection |
| 630 | 630 | * tracking mark field in the connection. |
| 631 | − * @OVS_CT_ATTR_LABEL: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN | |
| 631 | + * @OVS_CT_ATTR_LABELS: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN | |
| 632 | 632 | * mask. For each bit set in the mask, the corresponding bit in the value is |
| 633 | 633 | * copied to the connection tracking label field in the connection. |
| 634 | 634 | * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG. |
| @@ -38,13 +38,6 @@ · 37 unmodified lines | ||
| 38 | 38 | |
| 39 | 39 | #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 | 42 | * The IOCTL interface is designed for extensibility by embedding the |
| 50 | 43 | * structure length (argsz) and flags into structures passed between |