Applying: Documentation updates for comments in #40255
Using index info to reconstruct a base tree...
M	cni/pkg/repair/repair_test.go
M	operator/pkg/patch/patch.go
M	pkg/dns/client/dns_test.go
M	pkg/istio-agent/health/health_probers.go
M	pkg/kube/inject/initializer.go
M	pkg/test/framework/components/echo/echotest/filters.go
M	pkg/test/framework/components/echo/echotest/run.go
M	pkg/test/framework/components/echo/echotest/setup.go
M	pkg/test/framework/components/istio/kube.go
M	tools/bug-report/pkg/config/config.go
Falling back to patching base and 3-way merge...
Auto-merging tools/bug-report/pkg/config/config.go
CONFLICT (content): Merge conflict in tools/bug-report/pkg/config/config.go
Auto-merging pkg/test/framework/components/istio/kube.go
CONFLICT (content): Merge conflict in pkg/test/framework/components/istio/kube.go
Auto-merging pkg/test/framework/components/echo/echotest/setup.go
CONFLICT (content): Merge conflict in pkg/test/framework/components/echo/echotest/setup.go
Auto-merging pkg/test/framework/components/echo/echotest/run.go
CONFLICT (content): Merge conflict in pkg/test/framework/components/echo/echotest/run.go
Auto-merging pkg/test/framework/components/echo/echotest/filters.go
CONFLICT (content): Merge conflict in pkg/test/framework/components/echo/echotest/filters.go
Auto-merging pkg/kube/inject/initializer.go
CONFLICT (content): Merge conflict in pkg/kube/inject/initializer.go
Auto-merging pkg/istio-agent/health/health_probers.go
CONFLICT (content): Merge conflict in pkg/istio-agent/health/health_probers.go
Auto-merging pkg/dns/client/dns_test.go
CONFLICT (content): Merge conflict in pkg/dns/client/dns_test.go
Auto-merging operator/pkg/patch/patch.go
CONFLICT (content): Merge conflict in operator/pkg/patch/patch.go
Auto-merging cni/pkg/repair/repair_test.go
CONFLICT (content): Merge conflict in cni/pkg/repair/repair_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Documentation updates for comments in #40255
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".