1aedf2ccc6
Conflicts: include/linux/blkdev.h Trivial merge to incorporate tag prototypes.
Conflicts: include/linux/blkdev.h Trivial merge to incorporate tag prototypes.