From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org, jgarzik@redhat.com
Subject: Re: linux-next: net-current/net merge conflict
Date: Sun, 25 May 2008 23:29:58 -0700 (PDT) [thread overview]
Message-ID: <20080525.232958.10056357.davem@davemloft.net> (raw)
In-Reply-To: <20080526133234.d6ae478e.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 May 2008 13:32:34 +1000
> Today's linux-next merge of the net tree got a trivial conflict in
> drivers/net/cpmac.c between commit
> f917d58031fce6dfd7cea71259ea6a2b663ec813 ("cpmac bugfixes and
> enhancements") from the net-current tree and commit
> 7d2e3cb7000b883a8e489485ac249be572fe17b1 ("[netdrvr] Trim trailing
> whitespace for several drivers") from the net tree. The former removed a
> comment that the latter made a whitespace fix to.
Thanks Stephen.
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.
next prev parent reply other threads:[~2008-05-26 6:30 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 [this message]
2008-05-26 7:49 ` Stephen Rothwell
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=20080525.232958.10056357.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=jgarzik@redhat.com \
--cc=linux-next@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).