archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: David Miller <>
Cc:, Jeff Garzik <>
Subject: linux-next: net-current/net merge conflict
Date: Mon, 26 May 2008 13:32:34 +1000	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

Hi Dave, Jeff,

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.

Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

             reply	other threads:[~2008-05-26  3:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-26  3:32 Stephen Rothwell [this message]
2008-05-26  6:29 ` linux-next: net-current/net merge conflict David Miller
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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* 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).