From: Sam Ravnborg <sam@ravnborg.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the net-next tree with the sparc-next tree
Date: Thu, 17 May 2012 07:54:10 +0200 [thread overview]
Message-ID: <20120517055410.GA2247@merkur.ravnborg.org> (raw)
In-Reply-To: <20120517130406.1706f944820bbe8dc5e368f2@canb.auug.org.au>
> So I applied this merge fixup to the merge of the net-next tree today
> (and can carry it as necessary):
Perfect. And please carry this as we do not plan to solve this
conflict.
Sam
prev parent reply other threads:[~2012-05-17 5:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 4:39 linux-next: manual merge of the net-next tree with the sparc-next tree Stephen Rothwell
2012-05-16 5:02 ` Sam Ravnborg
2012-05-17 3:04 ` Stephen Rothwell
2012-05-17 5:54 ` Sam Ravnborg [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=20120517055410.GA2247@merkur.ravnborg.org \
--to=sam@ravnborg.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).