Successfully created backport PR for staging-24.11:

• [Backport staging-24.11] systemd: 256.7 -> 256.8 #356555

git bisect says this PR broke patch application in staging for systemdMinimal as:

$ nix build --no-link -f. systemdMinimal
...
systemd-minimal> applying patch /nix/store/r7s8r0nv2n8nw9hw7s275va27g2lgx8b-0019-Revert-boot-Make-initrd_prepare-semantically-equival.patch
systemd-minimal> patching file src/boot/efi/boot.c
systemd-minimal> Hunk #4 FAILED at 2292.
systemd-minimal> Hunk #5 succeeded at 2382 (offset 9 lines).
systemd-minimal> Hunk #6 succeeded at 2402 (offset 9 lines).
systemd-minimal> 1 out of 6 hunks FAILED -- saving rejects to file src/boot/efi/boot.c.rej

@trofi got here 5 minutes before me 😅

I assume the failing patch is #355290.

#356686

The PR for the now‐upstreamed patch was merged some five days before this PR was opened. I’m a little concerned that we merged this without anyone trying to build the merge despite there having been changes to systemd in staging since the parent of the commit. Admittedly GitHub should surface such things better. (Edit: and I’m not trying to point fingers here, I’ve done some sloppy stuff lately too – just seems like a process problem.)

This is my bad. I didn't test the merge like I should have. I didn't know that other patch had been fixed upstream, let alone backported.