From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 14 Nov 2013 15:29:01 +0000 (-0700)
Subject: Merge branch 'for-3.13/post-mq-drivers' into for-linus
X-Git-Tag: v4.13~8392^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1355b37f111b35cd6f53078ce63997aec473629f;p=mirror_ubuntu-bionic-kernel.git

Merge branch 'for-3.13/post-mq-drivers' into for-linus
---

1355b37f111b35cd6f53078ce63997aec473629f
diff --cc drivers/block/Makefile
index 03b3b4a2bd8a,f33b36694289..8cc98cd0d4a8
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@@ -41,7 -42,7 +42,8 @@@ obj-$(CONFIG_BLK_DEV_RBD)     += rbd.
  obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX)	+= mtip32xx/
  
  obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
 +obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o
  
  nvme-y		:= nvme-core.o nvme-scsi.o
+ skd-y		:= skd_main.o
  swim_mod-y	:= swim.o swim_asm.o