From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 8 Sep 2020 07:42:33 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.14.197~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d3bb79e3bbe5f8e378f1b488134fbece384c3fc;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue into master
---

4d3bb79e3bbe5f8e378f1b488134fbece384c3fc
diff --cc queue-5.4/series
index f1c9ad1d2b2,1d77fc426dd..2faf8e1e8de
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@@ -83,4 -83,5 +83,6 @@@ btrfs-allocate-scrub-workqueues-outside
  btrfs-set-the-correct-lockdep-class-for-new-nodes.patch
  btrfs-set-the-lockdep-class-for-log-tree-extent-buffers.patch
  btrfs-tree-checker-fix-the-error-message-for-transid-error.patch
 +net-core-use-listified-rx-for-gro_normal-in-napi_gro_receive.patch
+ btrfs-fix-potential-deadlock-in-the-search-ioctl.patch
+ revert-net-dsa-microchip-set-the-correct-number-of-p.patch