Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/blk_types.h between commit a38352e0ac02 ("block: Add an
explicit bio flag for bios that own their bvec") from the block tree and
commit "mm: make snapshotting pages for stable writes a per-bio
operation" from the akpm tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc include/linux/blk_types.h index e8de670,22990cf..0000000 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@@ -116,8 -117,7 +117,8 @@@ struct bio * Flags starting here get preserved by bio_reset() - this includes * BIO_POOL_IDX() */ - #define BIO_RESET_BITS 12 - #define BIO_OWNS_VEC 12 /* bio_free() should free bvec */ + #define BIO_RESET_BITS 13 ++#define BIO_OWNS_VEC 13 /* bio_free() should free bvec */ #define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag)))
pgpOTgIDvUY5x.pgp
Description: PGP signature
