All conflicts were simple overlapping changes except perhaps for the Thunder driver. That driver has a change_mtu method explicitly for sending a message to the hardware. If that fails it returns an error. Normally a driver doesn't need an ndo_change_mtu method becuase those are usually just range changes, which are now handled generically. But since this extra operation is needed in the Thunder driver, it has to stay. However, if the message send fails we have to restore the original MTU before the change because the entire call chain expects that if an error is thrown by ndo_change_mtu then the MTU did not change. Therefore code is added to nicvf_change_mtu to remember the original MTU, and to restore it upon nicvf_update_hw_max_frs() failue.
Showing the changes to include/uapi/linux (1 of 242 files). Show all
Unified · Split
| @@ -972,12 +972,19 @@ struct kvm_irqfd { · 971 unmodified lines | ||
| 972 | 972 | __u8 pad[16]; |
| 973 | 973 | }; |
| 974 | 974 | |
| 975 | +/* For KVM_CAP_ADJUST_CLOCK */ | |
| 976 | + | |
| 977 | +/* Do not use 1, KVM_CHECK_EXTENSION returned it before we had flags. */ | |
| 978 | +#define KVM_CLOCK_TSC_STABLE 2 | |
| 979 | + | |
| 975 | 980 | struct kvm_clock_data { |
| 976 | 981 | __u64 clock; |
| 977 | 982 | __u32 flags; |
| 978 | 983 | __u32 pad[9]; |
| 979 | 984 | }; |
| 980 | 985 | |
| 986 | +/* For KVM_CAP_SW_TLB */ | |
| 987 | + | |
| 981 | 988 | #define KVM_MMU_FSL_BOOKE_NOHV 0 |
| 982 | 989 | #define KVM_MMU_FSL_BOOKE_HV 1 |
| 983 | 990 | |