From: Marek Lindner <lindner_marek@yahoo.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] [PATCH] batman-adv: swap lines to get in sync with networking branch
Date: Sat, 25 Aug 2012 01:16:57 +0200 [thread overview]
Message-ID: <201208250116.57820.lindner_marek@yahoo.de> (raw)
In-Reply-To: <1345588805-27249-1-git-send-email-ordex@autistici.org>
On Wednesday, August 22, 2012 00:40:05 Antonio Quartulli wrote:
> due to a merge conflict resolution handled differently in the networking
> branch, we now have a small divergence between our next branch and what we
> already have in net/batman-adv/ in the kernel. Since we cannot ask the
> kernel guys to "swap two lines", with this patch we fix the problem in our
> repo
>
> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
> ---
>
> - this patch is for next
>
>
> soft-interface.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied in revision 28d246e.
Thanks,
Marek
prev parent reply other threads:[~2012-08-24 23:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-21 22:40 [B.A.T.M.A.N.] [PATCH] batman-adv: swap lines to get in sync with networking branch Antonio Quartulli
2012-08-24 23:16 ` Marek Lindner [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=201208250116.57820.lindner_marek@yahoo.de \
--to=lindner_marek@yahoo.de \
--cc=b.a.t.m.a.n@lists.open-mesh.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