From: Linus Torvalds Date: Wed, 18 Jan 2012 23:41:27 +0000 (-0800) Subject: nvme: fix merge error due to change of 'make_request_fn' fn type X-Git-Tag: v3.3-rc1~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93c3d65b28bab6da520c2add9cb387a0303f8b2d;p=pandora-kernel.git nvme: fix merge error due to change of 'make_request_fn' fn type The type of 'make_request_fn' changed in 5a7bbad27a4 ("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 Cc: Matthew Wilcox Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed