Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
block/blk-settings.c
between commit:
9bb33f24abbd ("block: refactor the bounce buffering code")
from the block tree and commit:
1d4982a2dc66 ("include: remove pagemap.h from blkdev.h")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc block/blk-settings.c
index 9c009090c4b5,976085a44fb8..000000000000
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@@ -7,6 -7,8 +7,7 @@@
#include <linux/init.h>
#include <linux/bio.h>
#include <linux/blkdev.h>
+ #include <linux/pagemap.h>
-#include <linux/memblock.h> /* for max_pfn/max_low_pfn */
#include <linux/gcd.h>
#include <linux/lcm.h>
#include <linux/jiffies.h>
Attachment:
pgpcZFp6lVztw.pgp
Description: OpenPGP digital signature
