* linux-next: manual merge of the moduleh tree with the s390 tree
@ 2011-09-14 5:25 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-09-14 5:25 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Peter Oberparleiter,
Martin Schwidefsky, Heiko Carstens
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/s390/char/vmur.c between commit 003184781fea ("[S390] s390: fix
mismatch in summation of I/O IRQ statistics") from the s390 tree and
commit e7a6a4ef9ffe ("s390: add missing module.h/export.h includes") from
the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary. (Or this part of the moduleh commit could be added to the
s390 tree.)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/s390/char/vmur.c
index d291a54,c9782ff..0000000
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@@ -11,6 -11,8 +11,7 @@@
#define KMSG_COMPONENT "vmur"
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
-#include <linux/kernel_stat.h>
+ #include <linux/module.h>
#include <linux/cdev.h>
#include <linux/slab.h>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-09-14 5:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-14 5:25 linux-next: manual merge of the moduleh tree with the s390 tree Stephen Rothwell
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).