diff options
| author | Jens Axboe <axboe@kernel.dk> | 2026-05-26 15:51:57 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2026-05-26 15:51:57 -0600 |
| commit | 072afc5d25354584a9888455c2fb3a8d21bdc754 (patch) | |
| tree | 7256e00f95497e258069fef74083eba0f86097d7 /block | |
| parent | 4eb13b2e1dd7ef19067574275a5bf7bcbd89ffb8 (diff) | |
| parent | fb0eeeed91f3236133383445fee5cc8f20330e6e (diff) | |
| download | linux-next-history-072afc5d25354584a9888455c2fb3a8d21bdc754.tar.gz | |
Merge branch 'for-7.2/block' into for-next
* for-7.2/block:
nvme-multipath: enable PCI P2PDMA for multipath devices
md: propagate BLK_FEAT_PCI_P2PDMA from member devices to RAID device
block: clear BLK_FEAT_PCI_P2PDMA in blk_stack_limits() for non-supporting devices
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-settings.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 78c83817b9d36..8274631290dbf 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -795,6 +795,8 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, t->features &= ~BLK_FEAT_NOWAIT; if (!(b->features & BLK_FEAT_POLL)) t->features &= ~BLK_FEAT_POLL; + if (!(b->features & BLK_FEAT_PCI_P2PDMA)) + t->features &= ~BLK_FEAT_PCI_P2PDMA; t->flags |= (b->flags & BLK_FLAG_MISALIGNED); |