[stable] tree: promote changes from testing at 0d7d22fb781f5a42ba98f4947b54efe1c39beef7

[coreosbot-releng]

Triggered by @jlebon in coreos/fedora-coreos-streams#789.

[marmijo]

LGTM

An update is needed to resolve some conflicting files

[jlebon]

I'm not sure, but I think the peter-evans/create-pull-request action got confused by the promotion and revert of the promotion in #2664 and thought that it didn't have to update stable-promotion branch to the latest stable base. This bit of the GHA logs looks suspicious:

2023-10-16T21:05:14.2931610Z [command]/usr/bin/git rev-list --left-only --count fork/stable-promotion...stable-promotion
2023-10-16T21:05:14.2967312Z 0
2023-10-16T21:05:14.2972648Z Branch 'stable-promotion' is even with its remote and will not be updated

So I manually updated this PR for now. I think one way to fix this is to force-push to the fork's branch before calling out to the create-pull-request Action.

[marmijo]

Thank you @jlebon!

[marmijo]

LGTM