gitstream tried to cherry-pick commit 0957427e568f5a2fe78772f3adea4e0a6a64b063 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Use ubuntu-20.04 explicitly in CI instead of ubuntu-latest (#403)
Currently Ubuntu 22.04 LTS includes default kernel versions with their
respective linux-headers package missing from the repos.
Signed-off-by: Michail Resvanis <mresvani@redhat.com>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Output
```
CONFLICT (modify/delete): .github/workflows/e2e.yaml deleted in HEAD and modified in 0957427 (Use ubuntu-20.04 explicitly in CI instead of ubuntu-latest (#403)). Version 0957427 (Use ubuntu-20.04 explicitly in CI instead of ubuntu-latest (#403)) of .github/workflows/e2e.yaml left in tree.
Auto-merging ci/kmm-kmod-dockerfile.yaml
CONFLICT (content): Merge conflict in ci/kmm-kmod-dockerfile.yaml
error: could not apply 0957427... Use ubuntu-20.04 explicitly in CI instead of ubuntu-latest (#403)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
```
gitstream tried to cherry-pick commit
0957427e568f5a2fe78772f3adea4e0a6a64b063
fromhttps://github.com/kubernetes-sigs/kernel-module-management
but was unable to do so.Commit message:
Please cherry-pick the commit manually.
Error:
Command:
/usr/bin/git cherry-pick -n 0957427e568f5a2fe78772f3adea4e0a6a64b063 -m1
Output
``` CONFLICT (modify/delete): .github/workflows/e2e.yaml deleted in HEAD and modified in 0957427 (Use ubuntu-20.04 explicitly in CI instead of ubuntu-latest (#403)). Version 0957427 (Use ubuntu-20.04 explicitly in CI instead of ubuntu-latest (#403)) of .github/workflows/e2e.yaml left in tree. Auto-merging ci/kmm-kmod-dockerfile.yaml CONFLICT (content): Merge conflict in ci/kmm-kmod-dockerfile.yaml error: could not apply 0957427... Use ubuntu-20.04 explicitly in CI instead of ubuntu-latest (#403) hint: after resolving the conflicts, mark the corrected paths hint: with 'git addUpstream-Commit: 0957427e568f5a2fe78772f3adea4e0a6a64b063