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

diff --cc queue-5.10/series
index 284ea689d979a6b4603526875f45931e553cba3c,dda88b2818889d4ce706ce5f9db45d7f5d1515bc..6a2b4ba01ea74b1ab2e03df4cadc371ab2253009
--- 1/queue-5.10/series
--- 2/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