Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Showing the changes to include/uapi/linux (5 of 805 files). Show all
Unified · Split
| @@ -65,7 +65,7 @@ · 64 unmodified lines | ||
| 65 | 65 | |
| 66 | 66 | /* keyctl structures */ |
| 67 | 67 | struct keyctl_dh_params { |
| 68 | − __s32 private; | |
| 68 | + __s32 dh_private; | |
| 69 | 69 | __s32 prime; |
| 70 | 70 | __s32 base; |
| 71 | 71 | }; |
| @@ -952,6 +952,7 @@ struct kvm_ppc_resize_hpt { · 951 unmodified lines | ||
| 952 | 952 | #define KVM_CAP_S390_HPAGE_1M 156 |
| 953 | 953 | #define KVM_CAP_NESTED_STATE 157 |
| 954 | 954 | #define KVM_CAP_ARM_INJECT_SERROR_ESR 158 |
| 955 | +#define KVM_CAP_MSR_PLATFORM_INFO 159 | |
| 955 | 956 | |
| 956 | 957 | #ifdef KVM_CAP_IRQ_ROUTING |
| 957 | 958 | |
| @@ -144,7 +144,7 @@ enum perf_event_sample_format { · 143 unmodified lines | ||
| 144 | 144 | |
| 145 | 145 | PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */ |
| 146 | 146 | |
| 147 | − __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, | |
| 147 | + __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ | |
| 148 | 148 | }; |
| 149 | 149 | |
| 150 | 150 | /* |
| @@ -37,6 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | |
| 38 | 38 | #include <linux/types.h> |
| 39 | 39 | #include <linux/socket.h> /* For __kernel_sockaddr_storage. */ |
| 40 | +#include <linux/in6.h> /* For struct in6_addr. */ | |
| 40 | 41 | |
| 41 | 42 | #define RDS_IB_ABI_VERSION 0x301 |
| 42 | 43 | |
| @@ -176,7 +176,7 @@ struct vhost_memory { · 175 unmodified lines | ||
| 176 | 176 | #define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1 |
| 177 | 177 | |
| 178 | 178 | #define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64) |
| 179 | −#define VHOST_GET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x26, __u64) | |
| 179 | +#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64) | |
| 180 | 180 | |
| 181 | 181 | /* VHOST_NET specific defines */ |
| 182 | 182 | |