Conflicts: drivers/net/wireless/ath/ath9k/Kconfig drivers/net/xen-netback/netback.c net/batman-adv/bat_iv_ogm.c net/wireless/nl80211.c The ath9k Kconfig conflict was a change of a Kconfig option name right next to the deletion of another option. The xen-netback conflict was overlapping changes involving the handling of the notify list in xen_netbk_rx_action(). Batman conflict resolution provided by Antonio Quartulli, basically keep everything in both conflict hunks. The nl80211 conflict is a little more involved. In 'net' we added a dynamic memory allocation to nl80211_dump_wiphy() to fix a race that Linus reported. Meanwhile in 'net-next' the handlers were converted to use pre and post doit handlers which use a flag to determine whether to hold the RTNL mutex around the operation. However, the dump handlers to not use this logic. Instead they have to explicitly do the locking. There were apparent bugs in the conversion of nl80211_dump_wiphy() in that we were not dropping the RTNL mutex in all the return paths, and it seems we very much should be doing so. So I fixed that whilst handling the overlapping changes. To simplify the initial returns, I take the RTNL mutex after we try to allocate 'tb'.
Showing the changes to include/uapi/linux (1 of 369 files). Show all
Unified · Split
| @@ -783,6 +783,7 @@ struct kvm_dirty_tlb { · 782 unmodified lines | ||
| 783 | 783 | #define KVM_REG_IA64 0x3000000000000000ULL |
| 784 | 784 | #define KVM_REG_ARM 0x4000000000000000ULL |
| 785 | 785 | #define KVM_REG_S390 0x5000000000000000ULL |
| 786 | +#define KVM_REG_MIPS 0x7000000000000000ULL | |
| 786 | 787 | |
| 787 | 788 | #define KVM_REG_SIZE_SHIFT 52 |
| 788 | 789 | #define KVM_REG_SIZE_MASK 0x00f0000000000000ULL |