Hi Jens,
Today's linux-next merge of the block tree got a conflict in
include/linux/blk_types.h between commit 713685111774 ("mm: make
snapshotting pages for stable writes a per-bio operation") from the tree
and commit a38352e0ac02 ("block: Add an explicit bio flag for bios that
own their bvec") from the block tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc include/linux/blk_types.h index 22990cf,e8de670..0000000 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@@ -117,7 -116,8 +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)))
pgpwjElf8Enut.pgp
Description: PGP signature
