Linus Torvalds 93c3d65b28 nvme: fix merge error due to change of 'make_request_fn' fn type ... The type of 'make_request_fn' changed in 5a7bbad27a ("block: remove support for bio remapping from ->make_request"), but the merge of the nvme driver didn't take that into account, and as a result the driver would compile with a warning: drivers/block/nvme.c: In function 'nvme_alloc_ns': drivers/block/nvme.c:1336:2: warning: passing argument 2 of 'blk_queue_make_request' from incompatible pointer type [enabled by default] include/linux/blkdev.h:830:13: note: expected 'void (*)(struct request_queue *, struct bio *)' but argument is of type 'int (*)(struct request_queue *, struct bio *)' It's benign, but the warning is annoying. Reported-by: Stephen Rothwell <sfr@canb.auug.org> Cc: Matthew Wilcox <matthew.r.wilcox@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2012-01-18 15:41:27 -08:00
..
aoe	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
drbd	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
mtip32xx	mtip32xx: do rebuild monitoring asynchronously	2012-01-04 22:01:32 +01:00
paride	paride/pcd: fix bool verbose module parameter.	2012-01-13 09:32:26 +10:30
xen-blkback	Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block	2012-01-15 12:48:41 -08:00
amiflop.c	fs: move code out of buffer.c	2012-01-03 22:54:07 -05:00
ataflop.c
brd.c	fs: move code out of buffer.c	2012-01-03 22:54:07 -05:00
cciss.c	block: add and use scsi_blk_cmd_ioctl	2012-01-14 15:07:24 -08:00
cciss.h	cciss: Adds simple mode functionality	2011-08-08 11:40:15 +02:00
cciss_cmd.h
cciss_scsi.c	cciss: auto engage SCSI mid layer at driver load time	2011-11-16 09:21:49 +01:00
cciss_scsi.h
cpqarray.c	drivers/block/cpqarray.c: use pci_dev->revision	2011-09-21 10:02:13 +02:00
cpqarray.h
cryptoloop.c
DAC960.c
DAC960.h
floppy.c	fs: move code out of buffer.c	2012-01-03 22:54:07 -05:00
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig	Merge git://git.infradead.org/users/willy/linux-nvme	2012-01-18 12:34:09 -08:00
loop.c	fs: move code out of buffer.c	2012-01-03 22:54:07 -05:00
Makefile	Merge git://git.infradead.org/users/willy/linux-nvme	2012-01-18 12:34:09 -08:00
mg_disk.c
nbd.c	nbd-replace-some-printk-with-dev_warn-and-dev_info-checkpatch-fixes	2011-08-19 14:48:28 +02:00
nvme.c	nvme: fix merge error due to change of 'make_request_fn' fn type	2012-01-18 15:41:27 -08:00
osdblk.c
pktcdvd.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
ps3disk.c	block: Fix files that are modules and hence need module.h	2011-10-31 19:31:13 -04:00
ps3vram.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
rbd.c	rbd: initialize snap_rwsem in rbd_add()	2012-01-12 11:00:50 -08:00
rbd_types.h
smart1,2.h
sunvdc.c
swim.c	m68k/mac: cleanup forward declarations	2011-12-10 19:52:46 +01:00
swim3.c	block/swim3: Locking fixes	2011-12-12 12:42:12 +01:00
swim_asm.S
sx8.c	block, sx8: kill blk_insert_request()	2011-12-14 00:33:37 +01:00
ub.c	block: add and use scsi_blk_cmd_ioctl	2012-01-14 15:07:24 -08:00
umem.c	block: remove support for bio remapping from ->make_request	2011-09-12 12:12:01 +02:00
umem.h
viodasd.c
virtio_blk.c	block: add and use scsi_blk_cmd_ioctl	2012-01-14 15:07:24 -08:00
xd.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
xd.h
xen-blkfront.c	Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block	2012-01-15 12:48:41 -08:00
xsysace.c	block: xsysace: Don't use NO_IRQ	2012-01-05 08:34:29 +01:00
z2ram.c