Cherry-picking error for 72f17428a09c17c68aa50c306ba498b0c2f27e02 #1742
Description
gitstream tried to cherry-pick commit 72f17428a09c17c68aa50c306ba498b0c2f27e02 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Add documentation for running KMM on tainted worker nodes
Document how to add custom tolerations via OLM Subscription's for
managed Kubernetes environments where worker nodes have custom
taints or no accessible control-plane nodes.
related to issue:https://github.com/kubernetes-sigs/kernel-module-management/issues/1215
Signed-off-by: Natali Shemtov <nshemtov@redhat.com>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 72f17428a09c17c68aa50c306ba498b0c2f27e02 -m1
Output
Auto-merging docs/mkdocs/documentation/install.md
CONFLICT (content): Merge conflict in docs/mkdocs/documentation/install.md
error: could not apply 72f17428... Add documentation for running KMM on tainted worker nodes
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: Disable this message with "git config set advice.mergeConflict false"
Upstream-Commit: 72f17428a09c17c68aa50c306ba498b0c2f27e02