From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Apr 2022 13:44:32 +0000 (+0200)
Subject: fix up queue-5.4/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
X-Git-Tag: v5.17.2~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f9f63e6bc855dc83a5789681d57b567c09dd92a;p=thirdparty%2Fkernel%2Fstable-queue.git

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

diff --git a/queue-5.4/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch b/queue-5.4/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
index 27df9dfd7ce..12bfb80a232 100644
--- a/queue-5.4/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
+++ b/queue-5.4/block-don-t-merge-across-cgroup-boundaries-if-blkcg-is-enabled.patch
@@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #include <linux/atomic.h>
  #include <linux/kthread.h>
  #include <linux/fs.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)