linux-next: manual merge of the moduleh tree with the s390 tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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>
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/