On Tue, Feb 16, 2016 at 11:01:25PM +0800, Antonio Quartulli wrote:
Hello David,
this pull request is intended for net.
David,
when merging net into net-next these patches will create a conflict which git should try to fix on its own. However, it will still ask you to confirm something. Here are the relevant chunks:
--- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@@ -544,11 -527,12 +544,17 @@@ void batadv_gw_node_update(struct batad * gets dereferenced. */ spin_lock_bh(&bat_priv->gw.list_lock); - hlist_del_init_rcu(&gw_node->list); + if (!hlist_unhashed(&gw_node->list)) { + hlist_del_init_rcu(&gw_node->list); + batadv_gw_node_free_ref(gw_node); + } spin_unlock_bh(&bat_priv->gw.list_lock);
++<<<<<<< HEAD + batadv_gw_node_put(gw_node); + ++======= ++>>>>>>> maint
if you have this conflict, please keep the "maint" block. Moreover, make sure that every reference to batadv_gw_node_free_ref() in this file is substituted with batadv_gw_node_put() (there should be only one).
diff --cc net/batman-adv/translation-table.c index 2fd5b28,7301a92..0000000 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -346,12 -311,14 +346,18 @@@ static void batadv_tt_global_size_mod(s
if (atomic_add_return(v, &vlan->tt.num_entries) == 0) { spin_lock_bh(&orig_node->vlan_list_lock); - hlist_del_init_rcu(&vlan->list); + if (!hlist_unhashed(&vlan->list)) { + hlist_del_init_rcu(&vlan->list); + batadv_orig_node_vlan_free_ref(vlan); + } spin_unlock_bh(&orig_node->vlan_list_lock); ++<<<<<<< HEAD + batadv_orig_node_vlan_put(vlan); ++======= ++>>>>>>> maint
if you have this conflict, please keep the "maint" block. Moreover, make sure that every reference to batadv_orig_node_vlan_free_ref() in this file is substituted with batadv_orig_node_vlan_put() (there should be only one).
Obviously, I can check the final result after your merge operation. Thanks!
Cheers,