[PATCH 0/3] Fix-up series for x86/master