search

rh-ecosystem-edge / kernel-module-management

The kernel module management operator builds, signs and loads kernel modules on OpenShift.
https://openshift-kmm.netlify.app
Apache License 2.0
26 stars 16 forks source link

Cherry-picking error for `83ea25b0414954c4f7eaff0ebba4df436335d35f` #462

Closed github-actions[bot] closed 1 year ago

github-actions[bot] commented 1 year ago

gitstream tried to cherry-pick commit 83ea25b0414954c4f7eaff0ebba4df436335d35f from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.

Commit message:

Expose module's name and namespace through build args and use them in the (#310)

#103

Please cherry-pick the commit manually.

Error:

could not cherry-pick: error running git: exit status 1

Command: /usr/bin/git cherry-pick -n 83ea25b0414954c4f7eaff0ebba4df436335d35f -m1

Output ``` Auto-merging Makefile CONFLICT (content): Merge conflict in Makefile Auto-merging ci/module-kmm-ci-build-sign.yaml CONFLICT (content): Merge conflict in ci/module-kmm-ci-build-sign.yaml CONFLICT (modify/delete): internal/build/job/maker.go deleted in HEAD and modified in 83ea25b (Expose module's name and namespace through build args and use them in the (#310)). Version 83ea25b (Expose module's name and namespace through build args and use them in the (#310)) of internal/build/job/maker.go left in tree. CONFLICT (modify/delete): internal/build/job/maker_test.go deleted in HEAD and modified in 83ea25b (Expose module's name and namespace through build args and use them in the (#310)). Version 83ea25b (Expose module's name and namespace through build args and use them in the (#310)) of internal/build/job/maker_test.go left in tree. Auto-merging internal/module/kernelmapper.go error: could not apply 83ea25b... Expose module's name and namespace through build args and use them in the (#310) hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' ```

Upstream-Commit: 83ea25b0414954c4f7eaff0ebba4df436335d35f

ybettan commented 1 year ago

/unassign @qbarrand /assign @erusso7 Assigning feature has a bug. Here is the fix: https://github.com/qbarrand/gitstream/pull/57

openshift-ci[bot] commented 1 year ago

@ybettan: GitHub didn't allow me to assign the following users: erusso7.

Note that only rh-ecosystem-edge members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time. For more information please see the contributor guide

In response to [this](https://github.com/rh-ecosystem-edge/kernel-module-management/issues/462#issuecomment-1451609800): >/unassign @qbarrand >/assign @erusso7 >Assigning feature has a bug. Here is the fix: https://github.com/qbarrand/gitstream/pull/57 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
ybettan commented 1 year ago

/cc @erusso7 The cherry pick has failed to create a PR due to some conflicts. Can you please create the PR manually?