From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 9 May 2021 09:55:46 +0000 (+0200)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v5.4.118~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad517086dbe1d6796edeb3f0c2e41c4d03fc943a;p=thirdparty%2Fkernel%2Fstable-queue.git

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

ad517086dbe1d6796edeb3f0c2e41c4d03fc943a
diff --cc queue-5.10/series
index 210d5a73d19,156b8775af6..26d1b402d42
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@@ -218,4 -218,5 +218,6 @@@ alsa-hda-realtek-fix-mic-boost-on-intel
  alsa-hda-realtek-headset-mic-issue-on-hp-platform.patch
  alsa-hda-realtek-fix-static-noise-on-alc285-lenovo-laptops.patch
  alsa-hda-realtek-add-quirk-for-intel-clevo-pcx0dx.patch
 +tools-power-turbostat-fix-turbostat-for-amd-zen-cpus.patch
+ btrfs-fix-race-when-picking-most-recent-mod-log-oper.patch
+ arm64-vdso-discard-.note.gnu.property-sections-in-vd.patch
diff --cc queue-5.11/series
index 717f0bdd68d,40035b59d7b..cba093fb052
--- a/queue-5.11/series
+++ b/queue-5.11/series
@@@ -250,4 -250,5 +250,6 @@@ alsa-hda-realtek-fix-mic-boost-on-intel
  alsa-hda-realtek-headset-mic-issue-on-hp-platform.patch
  alsa-hda-realtek-fix-static-noise-on-alc285-lenovo-laptops.patch
  alsa-hda-realtek-add-quirk-for-intel-clevo-pcx0dx.patch
 +tools-power-turbostat-fix-turbostat-for-amd-zen-cpus.patch
+ btrfs-fix-race-when-picking-most-recent-mod-log-oper.patch
+ arm64-vdso-discard-.note.gnu.property-sections-in-vd.patch
diff --cc queue-5.12/series
index 08df4eefa2a,2df47925a4e..92345596a1e
--- a/queue-5.12/series
+++ b/queue-5.12/series
@@@ -281,4 -281,6 +281,7 @@@ alsa-hda-realtek-fix-mic-boost-on-intel
  alsa-hda-realtek-headset-mic-issue-on-hp-platform.patch
  alsa-hda-realtek-fix-static-noise-on-alc285-lenovo-laptops.patch
  alsa-hda-realtek-add-quirk-for-intel-clevo-pcx0dx.patch
 +tools-power-turbostat-fix-turbostat-for-amd-zen-cpus.patch
+ btrfs-fix-race-when-picking-most-recent-mod-log-oper.patch
+ btrfs-fix-a-potential-hole-punching-failure.patch
+ arm64-vdso-discard-.note.gnu.property-sections-in-vd.patch