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 `8de1ea77f600f7d10f5558e781da3f1b4366a4ae` #608

Closed github-actions[bot] closed 1 year ago

github-actions[bot] commented 1 year ago

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

Commit message:

Make cert-manager an OLM dependency of KMM (#432)

Please cherry-pick the commit manually.

Error:

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

Command: /usr/bin/git cherry-pick -n 8de1ea77f600f7d10f5558e781da3f1b4366a4ae -m1

Output ``` Auto-merging Makefile CONFLICT (content): Merge conflict in Makefile error: could not apply 8de1ea77... Make cert-manager an OLM dependency of KMM (#432) hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' ```

Upstream-Commit: 8de1ea77f600f7d10f5558e781da3f1b4366a4ae

qbarrand commented 1 year ago

Not using cert-manager on OpenShift.