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

..

acpi

Merge branch 'pm-cpufreq'

2015-09-01 15:52:35 +02:00

asm-generic

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

clocksource

…

crypto

Merge branch 'for-4.3/sg' of git://git.kernel.dk/linux-block

2015-09-02 13:22:38 -07:00

drm

…

dt-bindings

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-09-01 13:09:20 -07:00

keys

…

kvm

…

linux

block: Refuse request/bio merges with gaps in the integrity payload

2015-09-11 09:03:04 -06:00

math-emu

…

media

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2015-09-01 18:46:42 -07:00

memory

…

misc

…

net

…

pcmcia

…

ras

…

rdma

…

rxrpc

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-09-02 12:22:54 -07:00

soc

…

sound

…

target

…

trace

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

uapi

Merge branch 'for-4.3/drivers' of git://git.kernel.dk/linux-block

2015-09-02 13:14:58 -07:00

video

drivers/video/fbdev/kyrofb: Use arch_phys_wc_add() and pci_ioremap_wc_bar()

2015-08-25 09:59:44 +02:00

xen

…

Kbuild

…