Martin K. Petersen
cb1a5ab6ec
block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined
...
Commit 4eaf99bead switched to returning bool and as a result reversed
the logic of the integrity merge checks. However, the empty stubs used
when the block integrity code is compiled out were still returning
0. Make these stubs return "true".
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Michael L. Semon <mlsemon35@gmail.com>
Tested-by: Michael L. Semon <mlsemon35@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
2014-10-28 20:27:43 -06:00
..
acpi
asm-generic
Merge git://git.infradead.org/users/eparis/audit
2014-10-19 16:25:56 -07:00
clocksource
crypto
crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code
2014-10-14 10:51:22 +02:00
drm
drm/mst: rework payload table allocation to conform better.
2014-10-13 14:40:53 +10:00
dt-bindings
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
keys
kvm
arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs
2014-10-16 10:57:41 +02:00
linux
block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined
2014-10-28 20:27:43 -06:00
math-emu
media
memory
misc
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-10-19 11:41:57 -07:00
pcmcia
ras
rdma
rxrpc
scsi
Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block
2014-10-18 11:53:51 -07:00
soc /tegra
sound
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
target
trace
A large number of cleanups and bug fixes, with some (minor) journal
2014-10-20 09:50:11 -07:00
uapi
Merge git://git.infradead.org/users/eparis/audit
2014-10-19 16:25:56 -07:00
video
fbdev changes for 3.18
2014-10-18 18:03:02 -07:00
xen
Kbuild