On Thu, 27 Nov 2025 at 08:43, Thomas Zimmermann <[email protected]> wrote: > > Hi > > Am 27.11.25 um 03:20 schrieb Richard Lyu: > > Hi Thomas, > > > > I am attempting to test this patch series but encountered merge conflicts > > when applying it to various trees. > > Could you please clarify the specific base commit (or branch/tag) this > > series was generated against? > > Thanks for testing. > > > > > When testing on the next branch on commits 7a2ff00 and e41ef37, I hit a > > conflict on PATCH v3 4/9: > > patching file drivers/pci/vgaarb.c > > Hunk #2 FAILED at 557. > > 1 out of 2 hunks FAILED -- rejects in file drivers/pci/vgaarb.c > > > > When testing against 3a86608 (Linux 6.18-rc1), the following conflicts > > occurred: > > patching file drivers/gpu/drm/sysfb/efidrm.c > > Hunk #1 FAILED at 24. > > 1 out of 2 hunks FAILED -- rejects in file drivers/gpu/drm/sysfb/efidrm.c > > patching file drivers/gpu/drm/sysfb/vesadrm.c > > Hunk #1 FAILED at 25. > > 1 out of 2 hunks FAILED -- rejects in file drivers/gpu/drm/sysfb/vesadrm.c > > > > Please let me know the correct base, and I will retest. > > It's in the cover letter: d724c6f85e80a23ed46b7ebc6e38b527c09d64f5 The > commit is in linux-next. The idea is that the EFI tree can pick up the > changes easily in the next cycle. linux-next seemed like the best > choice. Best regards Thomas
Thanks. I will queue this up as soon as -rc1 is released.
