From 3937ead089b8e39a9120fab705ff0e79c7efeed5 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 16 Jul 2020 11:38:16 +0200
Subject: [KERNEL] BLK_MQ_F_SG_MERGE removed in 5.1

---
 src/kernel/core.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/kernel/core.c b/src/kernel/core.c
index ef41158..35ea1ef 100644
--- a/src/kernel/core.c
+++ b/src/kernel/core.c
@@ -285,12 +285,10 @@ int dnbd3_add_device(struct dnbd3_device *dev, int minor)
 	 * nbd has this flags set (ther is no documentation)
 	 * BLK_MQ_F_SHOULD_MERGE: Reverse check our software queue for entries
 	 *     that we could potentially merge with
-	 * BLK_MQ_F_SG_MERGE: If SG merging is disabled, each bio vector is
-	 *     a segment.
 	 * BLK_MQ_F_BLOCKING: Wait for rcu if blocking, else wait for rcu in
 	 *     each queue.
 	 */
-	dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_SG_MERGE;
+	dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
 //			| BLK_MQ_F_BLOCKING;
 	dev->tag_set.driver_data = dev;
 
-- 
cgit v1.2.3-55-g7522