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: batman-adv merge-conflict
Date: Mon, 22 Apr 2013 20:40:24 -0400 (EDT) [thread overview]
Message-ID: <20130422.204024.29103974581251401.davem@davemloft.net> (raw)
In-Reply-To: <20130419082651.GA13226@ritirata.org>
From: Antonio Quartulli <ordex@autistici.org>
Date: Fri, 19 Apr 2013 10:26:51 +0200
> here are the instructions to resolve the conflicts you will get
> while merging net into net-next.
Thanks.
> I'm now going to send a pull request to fix some compile issues
> generated by the merge.
We never fix such breakage separately.
We put these kinds of things in the merge commit, so proper bisecting
is possible over the merge. And that's what I did just now.
next prev parent reply other threads:[~2013-04-23 0:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-19 8:26 batman-adv merge-conflict Antonio Quartulli
2013-04-23 0:40 ` David Miller [this message]
2013-04-23 4:49 ` Antonio Quartulli
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=20130422.204024.29103974581251401.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;
as well as URLs for NNTP newsgroup(s).