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,
Andrew Morton <akpm@linux-foundation.org>,
Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the moduleh tree with the staging.current tree
Date: Wed, 3 Aug 2011 13:51:50 +1000 [thread overview]
Message-ID: <20110803135150.249e34087e78caa2797d2b60@canb.auug.org.au> (raw)
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/dt3155v4l/dt3155v4l.c between commit dac95cb8cf40
("drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h") from the
staging.current tree and commit 9e1049c45c01 ("staging: Add module.h to
drivers/staging users") from the moduleh tree.
Also note that commit 5c751107250f ("staging: fix implicit use of slab.h
in dt3155v4l/dt3155v4l.c") from the moduleh tree is a duplicate of the
above staging.current tree commit (with the include in a slightly
different spot.
I fixed it up (see below) anc can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/dt3155v4l/dt3155v4l.c
index 05aa41c,024390b..0000000
--- a/drivers/staging/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/dt3155v4l/dt3155v4l.c
@@@ -21,8 -21,9 +21,9 @@@
#include <linux/version.h>
#include <linux/stringify.h>
#include <linux/delay.h>
-#include <linux/slab.h>
#include <linux/kthread.h>
+#include <linux/slab.h>
+ #include <linux/module.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-ioctl.h>
#include <media/videobuf2-dma-contig.h>
next reply other threads:[~2011-08-03 3:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-03 3:51 Stephen Rothwell [this message]
2011-08-05 1:48 ` 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=20110803135150.249e34087e78caa2797d2b60@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.gortmaker@windriver.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
all inboxes | Powered by JetHome®