From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 6 Apr 2022 13:26:20 +0000 (+0200)
Subject: fix up queue-4.19/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled... 
X-Git-Tag: v5.17.2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ff04f633248e430d73fa6732d4b815d62390eb3;p=thirdparty%2Fkernel%2Fstable-queue.git

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

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 15680b88ffa..6abbe43c229 100644
--- 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)