linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Subject: linux-next: manual merge of the moduleh tree with Linus' tree
Date: Wed, 28 Sep 2011 16:20:40 +1000	[thread overview]
Message-ID: <20110928162040.f22c4eb1f63b5ae7e4a13a34@canb.auug.org.au> (raw)

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c between commit
124d770a6459 ("pch_gbe: added the process of FIFO over run error") from
Linus' tree and commit c3c292bec445 ("drivers/net: Add module.h to
drivers who were implicitly using it") from the moduleh tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 5dc61b4,848dce1..0000000
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@@ -20,6 -20,8 +20,7 @@@
  
  #include "pch_gbe.h"
  #include "pch_gbe_api.h"
 -#include <linux/prefetch.h>
+ #include <linux/module.h>
  
  #define DRV_VERSION     "1.00"
  const char pch_driver_version[] = DRV_VERSION;

             reply	other threads:[~2011-09-28  6:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-28  6:20 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-10-25  8:37 linux-next: manual merge of the moduleh tree with Linus' tree Stephen Rothwell
2011-08-02  4:52 Stephen Rothwell
2011-08-02 17:17 ` Paul Gortmaker

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=20110928162040.f22c4eb1f63b5ae7e4a13a34@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    --cc=toshiharu-linux@dsn.okisemi.com \
    /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).