Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net.
Showing the changes to include/uapi/linux (2 of 284 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 dh_private; | |
| 68 | + __s32 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 | |