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

diff --cc queue-5.10/series
Simple merge

diff --cc queue-5.4/series
index 267df42d7298802264ff23ab237182b9fdc89154,c696ac439b790ebad3a7ba8212373d22d808e2af..3aaf7a9915fd40ed1604303936e90354fb9acf6a
--- 1/queue-5.4/series
--- 2/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