From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 29 Dec 2020 09:36:31 +0000 (+0100)
Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v4.4.249~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b877c5a0d87dce1e9de7d56d1169249741c592f;p=thirdparty%2Fkernel%2Fstable-queue.git

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

1b877c5a0d87dce1e9de7d56d1169249741c592f
diff --cc queue-5.10/series
index 284ea689d97,dda88b28188..6a2b4ba01ea
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@@ -715,4 -712,4 +712,5 @@@ rtc-ep93xx-fix-null-pointer-dereference
  revert-ring-buffer-remove-have_64bit_aligned_access.patch
  null_blk-fix-zone-size-initialization.patch
  null_blk-fail-zone-append-to-conventional-zones.patch
 +drm-edid-fix-objtool-warning-in-drm_cvt_modes.patch
+ x86-cpu-amd-save-amd-nodeid-as-cpu_die_id.patch