From: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org
Subject: Re: pull request: batman-adv 2012-09-25
Date: Tue, 25 Sep 2012 18:01:19 +0200 [thread overview]
Message-ID: <20120925160119.GA31069@ritirata.org> (raw)
In-Reply-To: <1348588637-18441-1-git-send-email-ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
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];
>>>>>>
next prev parent reply other threads:[~2012-09-25 16:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 15:57 pull request: batman-adv 2012-09-25 Antonio Quartulli
2012-09-25 15:57 ` [PATCH net 2/2] batman-adv: Fix symmetry check / route flapping in multi interface setups Antonio Quartulli
[not found] ` <1348588637-18441-1-git-send-email-ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
2012-09-25 15:57 ` [PATCH net 1/2] batman-adv: Fix change mac address of soft iface Antonio Quartulli
2012-09-25 16:01 ` Antonio Quartulli [this message]
[not found] ` <20120925160119.GA31069-E/2OGukznS5g9hUCZPvPmw@public.gmane.org>
2012-09-28 18:42 ` pull request: batman-adv 2012-09-25 David Miller
2012-09-25 17:25 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120925160119.GA31069@ritirata.org \
--to=ordex-gaufno9rbhfsroww+9zijq@public.gmane.org \
--cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).