| Message ID | 20240521183524.GQ2118490@ZenIV (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [git,pull] vfs.git last bdev series | expand |
The pull request you sent on Tue, 21 May 2024 19:35:24 +0100:
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-bd_flags-2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3413efa8885d7a714c54c6752eaf49fd17d351c9
Thank you!
bdev flags pile. Two trivial conflicts (block/bdev.c and block/blk-core.c) and one place block/blk-zoned.c where git does not detect a conflict between the access to ->bd_has_submit_bio added in mainline and switch of ->bd_has_submit_bio checks to bdev_test_flag() in this branch. #merge-candidate contains proposed resolution. So does (tree-identical) #pull-bd_flags-3, with the branch rebased on top of bd_inode-1 merge - same resulting tree, easier on git blame, but that one does have a rebase. If you would prefer a pull request for that one, just say so... The following changes since commit 39cd87c4eb2b893354f3b850f916353f2658ae6f: Linux 6.9-rc2 (2024-03-31 14:32:39 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-bd_flags-2 for you to fetch changes up to 811ba89a8838e7c43ff46b6210ba1878bfe4437e: bdev: move ->bd_make_it_fail to ->__bd_flags (2024-05-02 20:04:18 -0400) ---------------------------------------------------------------- Compactifying bdev flags We can easily have up to 24 flags with sane atomicity, _without_ pushing anything out of the first cacheline of struct block_device. ---------------------------------------------------------------- Al Viro (8): Use bdev_is_paritition() instead of open-coding it wrapper for access to ->bd_partno bdev: infrastructure for flags bdev: move ->bd_read_only to ->__bd_flags bdev: move ->bd_write_holder into ->__bd_flags bdev: move ->bd_has_subit_bio to ->__bd_flags bdev: move ->bd_ro_warned to ->__bd_flags bdev: move ->bd_make_it_fail to ->__bd_flags block/bdev.c | 17 ++++++++--------- block/blk-core.c | 17 ++++++++++------- block/blk-mq.c | 2 +- block/early-lookup.c | 2 +- block/genhd.c | 15 ++++++++++----- block/ioctl.c | 5 ++++- block/partitions/core.c | 12 ++++++------ include/linux/blk_types.h | 17 +++++++++-------- include/linux/blkdev.h | 26 +++++++++++++++++++++++--- include/linux/part_stat.h | 2 +- lib/vsprintf.c | 4 ++-- 11 files changed, 75 insertions(+), 44 deletions(-)