Sagi Grimberg
7f39add3b0
block: Refuse request/bio merges with gaps in the integrity payload ...
If a driver sets the block queue virtual boundary mask, it means that
it cannot handle gaps so we must not allow those in the integrity
payload as well.
Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Fixed up by me to have duplicate integrity merge functions, depending
on whether block integrity is enabled or not. Fixes a compilations
issue with CONFIG_BLK_DEV_INTEGRITY unset.
Signed-off-by: Jens Axboe <axboe@fb.com>
2015-09-11 09:03:04 -06:00
Merge branch 'pm-cpufreq'
2015-09-01 15:52:35 +02:00
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 10:07:40 -07:00
Merge branch 'for-4.3/sg' of git://git.kernel.dk/linux-block
2015-09-02 13:22:38 -07:00
drm/edid: add function to help find SADs
2015-08-20 09:46:08 +10:00
ARM: DT updates for v4.3
2015-09-01 13:09:20 -07:00
block: Refuse request/bio merges with gaps in the integrity payload
2015-09-11 09:03:04 -06:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-09-01 18:46:42 -07:00
cxl: Add AFU virtual PHB and kernel API
2015-06-03 13:27:20 +10:00
net: sched: fix refcount imbalance in actions
2015-07-30 14:20:39 -07:00
tracing: add trace event for memory-failure
2015-06-24 17:49:43 -07:00
IB: Add rdma_cap_ib_switch helper and use where appropriate
2015-07-14 13:20:08 -04:00
SCSI misc on 20150901
2015-09-02 12:22:54 -07:00
ARM: tegra: Memory controller updates for v4.3-rc1
2015-08-20 18:50:17 -07:00
ASoC: topology: Add Kconfig option for topology
2015-08-17 22:45:47 -07:00
iscsi-target: Fix iscsit_start_kthreads failure OOPs
2015-07-24 14:19:43 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-08-31 20:26:22 -07:00
Merge branch 'for-4.3/drivers' of git://git.kernel.dk/linux-block
2015-09-02 13:14:58 -07:00
drivers/video/fbdev/kyrofb: Use arch_phys_wc_add() and pci_ioremap_wc_bar()
2015-08-25 09:59:44 +02:00
7f39add3b0