en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in 'net'. The esp{4,6}_offload.c conflicts were overlapping changes. The 'out' label is removed so we just return ERR_PTR(-EINVAL) directly.
Showing the changes to include/uapi/linux (1 of 68 files). Show all
Unified · Split
| @@ -932,6 +932,8 @@ struct kvm_ppc_resize_hpt { · 931 unmodified lines | ||
| 932 | 932 | #define KVM_CAP_HYPERV_SYNIC2 148 |
| 933 | 933 | #define KVM_CAP_HYPERV_VP_INDEX 149 |
| 934 | 934 | #define KVM_CAP_S390_AIS_MIGRATION 150 |
| 935 | +#define KVM_CAP_PPC_GET_CPU_CHAR 151 | |
| 936 | +#define KVM_CAP_S390_BPB 152 | |
| 935 | 937 | |
| 936 | 938 | #ifdef KVM_CAP_IRQ_ROUTING |
| 937 | 939 | |
| @@ -1261,6 +1263,8 @@ struct kvm_s390_ucas_mapping { · 323 unmodified lines | ||
| 1261 | 1263 | #define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg) |
| 1262 | 1264 | /* Available with KVM_CAP_PPC_RADIX_MMU */ |
| 1263 | 1265 | #define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info) |
| 1266 | +/* Available with KVM_CAP_PPC_GET_CPU_CHAR */ | |
| 1267 | +#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char) | |
| 1264 | 1268 | |
| 1265 | 1269 | /* ioctl for vm fd */ |
| 1266 | 1270 | #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device) |