please backport EFI patches to v6.1