Patch 1 is definitely intended for 4.21, to limit possible performance fallout from the ERMS series. Patch 2 may be too intrusive to consider taking at this point.
1: x86/AMD: avoid REP MOVSB for Zen3/4 2: x86: guard synthetic feature and bug enumerators Jan
