Cherry-picking error for `6dd29b754e0a56417e6a1784718076a4fd725d97`

[github-actions[bot]]

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

Commit message:

Update skipper configuration (#422)

1) removing operator-sdk, kustomize and mockgen, since makefile is
   using the once installed under the repo/bin directory
2) update the mockgen version

Please cherry-pick the commit manually.

---

Error:

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

---

Command: /usr/bin/git cherry-pick -n 6dd29b754e0a56417e6a1784718076a4fd725d97 -m1

Output

``` Auto-merging Dockerfile.kmm-operator-build CONFLICT (content): Merge conflict in Dockerfile.kmm-operator-build error: could not apply 6dd29b75... Update skipper configuration (#422) hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' ```

---

Upstream-Commit: 6dd29b754e0a56417e6a1784718076a4fd725d97

[yevgeny-shnaidman]

Fixed by PR