From: David Miller <davem@davemloft.net>
To: ordex@autistici.org
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] pull request: batman-adv 2012-09-25
Date: Fri, 28 Sep 2012 14:42:25 -0400 (EDT) [thread overview]
Message-ID: <20120928.144225.998897985645074639.davem@davemloft.net> (raw)
In-Reply-To: <20120925160119.GA31069@ritirata.org>
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.
next prev parent reply other threads:[~2012-09-28 18:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 15:57 [B.A.T.M.A.N.] pull request: batman-adv 2012-09-25 Antonio Quartulli
2012-09-25 15:57 ` [B.A.T.M.A.N.] [PATCH net 1/2] batman-adv: Fix change mac address of soft iface Antonio Quartulli
2012-09-25 15:57 ` [B.A.T.M.A.N.] [PATCH net 2/2] batman-adv: Fix symmetry check / route flapping in multi interface setups Antonio Quartulli
2012-09-25 16:01 ` [B.A.T.M.A.N.] pull request: batman-adv 2012-09-25 Antonio Quartulli
2012-09-28 18:42 ` David Miller [this message]
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=20120928.144225.998897985645074639.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=netdev@vger.kernel.org \
--cc=ordex@autistici.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