Message ID | 1348588637-18441-1-git-send-email-ordex@autistici.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Hello David, here are some instructions to solve the conflict you will hit while merging net with net-next. Thank you, Antonio ++<<<<<<< HEAD ++======= + int if_num; ++>>>>>>> 7caf69f... batman-adv: Fix symmetry check / route flapping in multi interface setups resolves to: ======== int if_num; >>>>>>>> ++<<<<<<< HEAD + sum_orig = orig_node_tmp->bcast_own_sum[if_incoming->if_num]; ++======= + if_num = router->if_incoming->if_num; + sum_orig = orig_node_tmp->bcast_own_sum[if_num]; ++>>>>>>> 7caf69f... batman-adv: Fix symmetry check / route flapping in multi interface setups resolves to: ======= if_num = router->if_incoming->if_num; sum_orig = orig_node_tmp->bcast_own_sum[if_num]; >>>>>>> ++<<<<<<< HEAD + sum_neigh = orig_node_tmp->bcast_own_sum[if_incoming->if_num]; ++======= + if_num = neigh_node->if_incoming->if_num; + sum_neigh = orig_node_tmp->bcast_own_sum[if_num]; ++>>>>>>> 7caf69f... batman-adv: Fix symmetry check / route flapping in multi interface setups resolves to: ======= if_num = neigh_node->if_incoming->if_num; sum_neigh = orig_node_tmp->bcast_own_sum[if_num]; >>>>>> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Antonio Quartulli <ordex@autistici.org> Date: Tue, 25 Sep 2012 17:57:15 +0200 > here are two fixes (the last set) we would to propose for net/linux-3.6. > > The one from Def fixes a wrong behaviour of batman-adv in case of virtual > interface mac address change, while the other from Linüs fixes a problem in the > route selection which can lead to a continuous route flapping under certain > conditions. > > We would also like to enqueue both patches for sending to stable-3.5. > > During merge with net/master you will hit a conflict. I'm going to send some > instructions on how to solve it. ... > git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem Pulled, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Antonio Quartulli <ordex@autistici.org> Date: Tue, 25 Sep 2012 18:01:19 +0200 > here are some instructions to solve the conflict you will hit while merging net > with net-next. Thanks a lot. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html