On Thu, Nov 15, 2018 at 04:53:06PM +0800, Ming Lei wrote: > QUEUE_FLAG_NO_SG_MERGE has been killed, so kill BLK_MQ_F_SG_MERGE too. > > Cc: Dave Chinner <dchinner@xxxxxxxxxx> > Cc: Kent Overstreet <kent.overstreet@xxxxxxxxx> > Cc: Mike Snitzer <snitzer@xxxxxxxxxx> > Cc: dm-devel@xxxxxxxxxx > Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> > Cc: linux-fsdevel@xxxxxxxxxxxxxxx > Cc: Shaohua Li <shli@xxxxxxxxxx> > Cc: linux-raid@xxxxxxxxxxxxxxx > Cc: linux-erofs@xxxxxxxxxxxxxxxx > Cc: David Sterba <dsterba@xxxxxxxx> > Cc: linux-btrfs@xxxxxxxxxxxxxxx > Cc: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > Cc: linux-xfs@xxxxxxxxxxxxxxx > Cc: Gao Xiang <gaoxiang25@xxxxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxx> > Cc: Theodore Ts'o <tytso@xxxxxxx> > Cc: linux-ext4@xxxxxxxxxxxxxxx > Cc: Coly Li <colyli@xxxxxxx> > Cc: linux-bcache@xxxxxxxxxxxxxxx > Cc: Boaz Harrosh <ooo@xxxxxxxxxxxxxxx> > Cc: Bob Peterson <rpeterso@xxxxxxxxxx> > Cc: cluster-devel@xxxxxxxxxx Reviewed-by: Omar Sandoval <osandov@xxxxxx> > Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx> > --- > block/blk-mq-debugfs.c | 1 - > drivers/block/loop.c | 2 +- > drivers/block/nbd.c | 2 +- > drivers/block/rbd.c | 2 +- > drivers/block/skd_main.c | 1 - > drivers/block/xen-blkfront.c | 2 +- > drivers/md/dm-rq.c | 2 +- > drivers/mmc/core/queue.c | 3 +-- > drivers/scsi/scsi_lib.c | 2 +- > include/linux/blk-mq.h | 1 - > 10 files changed, 7 insertions(+), 11 deletions(-) [snip]