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];