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

diff --cc queue-5.4/series
index f1c9ad1d2b2454b78968ea3ad421e2bc94f9a372,1d77fc426ddbf76c176f8bc7f48418599df96f52..2faf8e1e8de61ab00417ef3fa1c53a51521eace2
--- 1/queue-5.4/series
--- 2/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