fails patch of grub 2.02 with current tips of warrior branch

[mmitchel]

ERROR: grub-efi-native-2.02-r0 do_patch: Command Error: 'quilt --quiltrc /srv/workspace/repo/poky-linux/build/tmp/work/x86_64-linux/grub-efi-native/2.02-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
Applying patch mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch
patching file grub-core/Makefile.core.def
Hunk #1 succeeded at 1754 (offset -116 lines).
patching file grub-core/commands/boot.c
patching file grub-core/gfxmenu/gui_label.c
patching file grub-core/lib/efi/mok2verify.c
patching file grub-core/loader/i386/linux.c
Hunk #1 FAILED at 36.
Hunk #2 succeeded at 673 (offset 38 lines).
Hunk #3 FAILED at 706.
Hunk #4 succeeded at 1181 (offset 18 lines).
2 out of 4 hunks FAILED -- rejects in file grub-core/loader/i386/linux.c
patching file grub-core/loader/linux.c
patching file grub-core/normal/main.c
patching file grub-core/normal/menu.c
Hunk #2 succeeded at 775 (offset -1 lines).
patching file grub-core/normal/menu_text.c
patching file include/grub/efi/mok2verify.h
Patch mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch does not apply (enforce with -f)
ERROR: grub-efi-native-2.02-r0 do_patch:
ERROR: grub-efi-native-2.02-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /srv/workspace/repo/poky-linux/build/tmp/work/x86_64-linux/grub-efi-native/2.02-r0/temp/log.do_patch.6005
ERROR: Task (virtual:native:/srv/workspace/repo/poky-linux/build/../layers/poky/meta/recipes-bsp/grub/grub-efi_2.02.bb:do_patch) failed with exit code '1'

poky is sync to tip of warrior branch at commit 01b8a8b54bc569e5ef3f5e6fc6abcee365ab25d9
meta-secure-core is sync to tip of master at commit 1275424

[TheNageek]

2nd this getting a similar patch error, poky is sync'd with same warrior branch commit, but I'm on meta-secure-core gatesgarth #226.

I see LAYERSERIES_COMPAT_efi-secure-boot = "thud warrior zeus dunfell gatesgarth" indicating that the gatesgarth branch is compatible with warrior.