linux-next: manual merge of the moduleh tree with the device-mappertree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/md/persistent-data/dm-space-map-disk.c between commit
661ae8a9604f ("The persistent-data library offers a re-usable framework
for the storage") from the device-mapper tree and fix up patch
"drivers-md-change-module.h-export.h-in-persistent-da.patch" from the
moduleh tree.

I fixed it up (see below) (the include of bitops.h has been removed in
the device-mapper commit).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/md/persistent-data/dm-space-map-disk.c
index aeff785,e6b9d67..0000000
--- a/drivers/md/persistent-data/dm-space-map-disk.c
+++ b/drivers/md/persistent-data/dm-space-map-disk.c
@@@ -12,7 -11,8 +12,7 @@@
  
  #include <linux/list.h>
  #include <linux/slab.h>
- #include <linux/module.h>
 -#include <linux/bitops.h>
+ #include <linux/export.h>
  #include <linux/device-mapper.h>
  
  #define DM_MSG_PREFIX "space map disk"

Attachment: pgp00000.pgp
Description: PGP signature