From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: linux-next@vger.kernel.org, jgarzik@redhat.com
Subject: Re: linux-next: net-current/net merge conflict
Date: Mon, 26 May 2008 17:49:47 +1000 [thread overview]
Message-ID: <20080526174947.88e2bd7a.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080525.232958.10056357.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 690 bytes --]
Hi Dave,
On Sun, 25 May 2008 23:29:58 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I'm trying to do a quick merge of net-2.6 into net-next-2.6
> right now and will push the result out to master.kernel.org
> after some build sanity tests.
>
> Hopefully that will resolve both of the current merge
> conflicts in the networking.
That should work, thanks. These merge conflict fixups are usually not a
real concern I just report them in case I do the wrong fixup and to keep
everyone informed. When you do necessary merges, these will just
disappear.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2008-05-26 7:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-26 3:32 linux-next: net-current/net merge conflict Stephen Rothwell
2008-05-26 6:29 ` David Miller
2008-05-26 7:49 ` Stephen Rothwell [this message]
2008-05-26 20:27 ` Jeff Garzik
2008-05-27 1:06 ` Stephen Rothwell
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=20080526174947.88e2bd7a.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=jgarzik@redhat.com \
--cc=linux-next@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;
as well as URLs for NNTP newsgroup(s).