From: Antonio Quartulli <ordex@autistici.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] batman-adv merge-conflict
Date: Tue, 23 Apr 2013 06:49:43 +0200 [thread overview]
Message-ID: <20130423044943.GG5732@ritirata.org> (raw)
In-Reply-To: <20130422.204024.29103974581251401.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 699 bytes --]
On Mon, Apr 22, 2013 at 08:40:24PM -0400, David Miller wrote:
> 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.
Ok. Thanks a lot David!
Regards,
--
Antonio Quartulli
..each of us alone is worth nothing..
Ernesto "Che" Guevara
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-04-23 4:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-19 8:26 [B.A.T.M.A.N.] batman-adv merge-conflict Antonio Quartulli
2013-04-23 0:40 ` David Miller
2013-04-23 4:49 ` Antonio Quartulli [this message]
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=20130423044943.GG5732@ritirata.org \
--to=ordex@autistici.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.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