| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20120925160119.GA31069@ritirata.org> Date: Tue, 25 Sep 2012 18:01:19 +0200 From: Antonio Quartulli <ordex@...istici.org> To: davem@...emloft.net Cc: netdev@...r.kernel.org, b.a.t.m.a.n@...ts.open-mesh.org Subject: Re: [B.A.T.M.A.N.] pull request: batman-adv 2012-09-25 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@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists