From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 8 Jun 2021 14:32:25 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.4.272~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0dbc0c1b61766b8d900bc44ffb47d202df20e05b;p=thirdparty%2Fkernel%2Fstable-queue.git

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

0dbc0c1b61766b8d900bc44ffb47d202df20e05b
diff --cc queue-5.4/series
index 267df42d729,c696ac439b7..3aaf7a9915f
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@@ -59,4 -59,6 +59,5 @@@ x86-apic-mark-_all_-legacy-interrupts-w
  btrfs-mark-ordered-extent-and-inode-with-error-if-we-fail-to-finish.patch
  btrfs-fix-error-handling-in-btrfs_del_csums.patch
  btrfs-return-errors-from-btrfs_del_csums-in-cleanup_ref_head.patch
 -btrfs-fix-fsync-failure-and-transaction-abort-after-writes-to-prealloc-extents.patch
  btrfs-fixup-error-handling-in-fixup_inode_link_counts.patch
+ mm-hugetlb-fix-simple-resv_huge_pages-underflow-on-u.patch