fix up queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled...

diff --git a/queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch b/queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
index 15680b88ffa850027affe29f800e192c5aa9703f..6abbe43c229e41a09bbad13260f739d5cc71061e 100644 (file)
--- a/queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
+++ b/queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
@@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #include <linux/bio.h>
  #include <linux/blkdev.h>
  #include <linux/scatterlist.h>
-+#include <linux/blk-cgroup.h>
++#include <linux/blkdev.h>
  
  #include <trace/events/block.h>
  
@@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #include <linux/blkdev.h>
  #include <linux/atomic.h>
  #include <linux/kthread.h>
-+#include <linux/blk-mq.h>
++#include <linux/blkdev.h>
  
  /* percpu_counter batch for blkg_[rw]stats, per-cpu drift doesn't matter */
  #define BLKG_STAT_CPU_BATCH   (INT_MAX / 2)