Could you switch your branch to pulling vfs.git#work.mount-base, drop cherry-picked "vfs: Create fs_context-aware mount_bdev() replacement" and use get_tree_bdev() instead of vfs_get_block_super()? I'd like to put #work.mount1 into -next instead of current #work.mount, and doing that would obviously cause conflict with your cherry-pick. #work.mount-base is the infrastructure part of that series and it'll be in never-rebased mode.
