Applying: use wellknown socket path for CredentialName
Using index info to reconstruct a base tree...
M	manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
M	manifests/charts/istio-control/istio-discovery/files/injection-template.yaml
M	manifests/charts/istiod-remote/files/injection-template.yaml
M	pilot/pkg/networking/core/v1alpha3/cluster.go
M	pilot/pkg/networking/core/v1alpha3/cluster_builder.go
M	pilot/pkg/networking/core/v1alpha3/cluster_builder_test.go
M	pilot/pkg/networking/core/v1alpha3/cluster_test.go
M	pilot/pkg/networking/core/v1alpha3/listener.go
M	pilot/pkg/security/model/authentication.go
M	pkg/istio-agent/agent.go
M	pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected
M	pkg/kube/inject/testdata/inject/auth.yaml.injected
M	pkg/kube/inject/testdata/inject/cronjob.yaml.injected
M	pkg/kube/inject/testdata/inject/daemonset.yaml.injected
M	pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected
M	pkg/kube/inject/testdata/inject/deploymentconfig-with-canonical-service-label.yaml.injected
M	pkg/kube/inject/testdata/inject/deploymentconfig.yaml.injected
M	pkg/kube/inject/testdata/inject/enable-core-dump-annotation.yaml.injected
M	pkg/kube/inject/testdata/inject/enable-core-dump.yaml.injected
M	pkg/kube/inject/testdata/inject/explicit-security-context.yaml.injected
M	pkg/kube/inject/testdata/inject/format-duration.yaml.injected
M	pkg/kube/inject/testdata/inject/frontend.yaml.injected
M	pkg/kube/inject/testdata/inject/grpc-agent.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-always.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-cncf-networks.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-existing-cncf-networks-json.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-existing-cncf-networks.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-image-pull-secret.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-image-secrets-in-values.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-mount-mtls-certs.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-mtls-not-ready.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-multi.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-multiple-image-secrets.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-namespace.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-never.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-no-seccontext.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-probes-noProxyHoldApplication-ProxyConfig.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-probes-proxyHoldApplication-ProxyConfig.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-probes-with-flag-set-in-annotation.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-probes-with-flag-unset-in-annotation.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-probes.proxyHoldsApplication.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-probes.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-proxy-override.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-readiness.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-template-in-values.yaml.injected
M	pkg/kube/inject/testdata/inject/hello-tproxy.yaml.injected
M	pkg/kube/inject/testdata/inject/hello.proxyHoldsApplication.yaml.injected
M	pkg/kube/inject/testdata/inject/hello.yaml.cni.injected
M	pkg/kube/inject/testdata/inject/hello.yaml.injected
M	pkg/kube/inject/testdata/inject/hello.yaml.proxyImageName.injected
M	pkg/kube/inject/testdata/inject/https-probes.yaml.injected
M	pkg/kube/inject/testdata/inject/job.yaml.injected
M	pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected
M	pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected
M	pkg/kube/inject/testdata/inject/list-frontend.yaml.injected
M	pkg/kube/inject/testdata/inject/list.yaml.injected
M	pkg/kube/inject/testdata/inject/multi-container.yaml.injected
M	pkg/kube/inject/testdata/inject/multi-init.yaml.injected
M	pkg/kube/inject/testdata/inject/multiple-templates.yaml.injected
M	pkg/kube/inject/testdata/inject/named_port.yaml.injected
M	pkg/kube/inject/testdata/inject/one_container.yaml.injected
M	pkg/kube/inject/testdata/inject/only-proxy-container.yaml.injected
M	pkg/kube/inject/testdata/inject/pod.yaml.injected
M	pkg/kube/inject/testdata/inject/prometheus-scrape.yaml.injected
M	pkg/kube/inject/testdata/inject/prometheus-scrape2.yaml.injected
M	pkg/kube/inject/testdata/inject/proxy-override-args.yaml.injected
M	pkg/kube/inject/testdata/inject/ready_live.yaml.injected
M	pkg/kube/inject/testdata/inject/ready_only.yaml.injected
M	pkg/kube/inject/testdata/inject/replicaset.yaml.injected
M	pkg/kube/inject/testdata/inject/replicationcontroller.yaml.injected
M	pkg/kube/inject/testdata/inject/resource_annotations.yaml.injected
M	pkg/kube/inject/testdata/inject/startup_live.yaml.injected
M	pkg/kube/inject/testdata/inject/startup_only.yaml.injected
M	pkg/kube/inject/testdata/inject/startup_ready_live.yaml.injected
M	pkg/kube/inject/testdata/inject/statefulset.yaml.injected
M	pkg/kube/inject/testdata/inject/status_annotations.yaml.injected
M	pkg/kube/inject/testdata/inject/status_annotations_zeroport.yaml.injected
M	pkg/kube/inject/testdata/inject/status_params.yaml.injected
M	pkg/kube/inject/testdata/inject/tcp-probes-disabled.yaml.injected
M	pkg/kube/inject/testdata/inject/tcp-probes.yaml.injected
M	pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml.injected
M	pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml.injected
M	pkg/kube/inject/testdata/inject/traffic-annotations.yaml.injected
M	pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml.injected
M	pkg/kube/inject/testdata/inject/traffic-params.yaml.injected
M	pkg/kube/inject/testdata/inject/two_container.yaml.injected
M	pkg/kube/inject/testdata/inject/user-volume.yaml.injected
M	pkg/kube/inject/testdata/inputs/custom-template.yaml.34.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/default.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/enable-core-dump.yaml.5.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello-existing-cncf-networks-json.yaml.16.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello-existing-cncf-networks.yaml.15.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello-image-pull-secret.yaml.11.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello-probes-noProxyHoldApplication-ProxyConfig.yaml.20.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello-probes.yaml.18.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.0.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.1.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.10.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.12.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.13.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.14.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.17.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.3.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/hello.yaml.4.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/kubevirtInterfaces.yaml.9.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/status_params.yaml.8.template.gen.yaml
M	pkg/kube/inject/testdata/inputs/traffic-params.yaml.7.template.gen.yaml
M	pkg/security/security.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/security/security.go
Auto-merging pkg/kube/inject/testdata/inputs/traffic-params.yaml.7.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/traffic-params.yaml.7.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/status_params.yaml.8.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/status_params.yaml.8.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/kubevirtInterfaces.yaml.9.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/kubevirtInterfaces.yaml.9.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.4.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.4.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.3.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.3.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.17.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.17.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.14.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.14.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.13.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.13.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.12.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.12.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.10.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.10.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.1.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.1.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello.yaml.0.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello.yaml.0.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello-probes.yaml.18.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello-probes.yaml.18.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello-probes-noProxyHoldApplication-ProxyConfig.yaml.20.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello-probes-noProxyHoldApplication-ProxyConfig.yaml.20.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello-image-pull-secret.yaml.11.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello-image-pull-secret.yaml.11.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello-existing-cncf-networks.yaml.15.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello-existing-cncf-networks.yaml.15.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/hello-existing-cncf-networks-json.yaml.16.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/hello-existing-cncf-networks-json.yaml.16.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/enable-core-dump.yaml.5.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/enable-core-dump.yaml.5.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/default.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/default.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inputs/custom-template.yaml.34.template.gen.yaml
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inputs/custom-template.yaml.34.template.gen.yaml
Auto-merging pkg/kube/inject/testdata/inject/user-volume.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/two_container.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/traffic-params.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/traffic-annotations.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/tcp-probes.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/tcp-probes-disabled.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/status_params.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/status_annotations_zeroport.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/status_annotations.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/statefulset.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/startup_ready_live.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/startup_only.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/startup_live.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/resource_annotations.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/replicationcontroller.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/replicaset.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/ready_only.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/ready_live.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/proxy-override-args.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/prometheus-scrape2.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/prometheus-scrape.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/pod.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/only-proxy-container.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/one_container.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/named_port.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/multiple-templates.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/multi-init.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/multi-container.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/list.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/list-frontend.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/job.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/https-probes.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello.yaml.proxyImageName.injected
Auto-merging pkg/kube/inject/testdata/inject/hello.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello.yaml.cni.injected
Auto-merging pkg/kube/inject/testdata/inject/hello.proxyHoldsApplication.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-tproxy.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-template-in-values.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-readiness.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-proxy-override.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-probes.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-probes.proxyHoldsApplication.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-probes-with-flag-unset-in-annotation.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-probes-with-flag-set-in-annotation.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-probes-proxyHoldApplication-ProxyConfig.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-probes-noProxyHoldApplication-ProxyConfig.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-no-seccontext.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-never.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-namespace.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-multiple-image-secrets.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-multi.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-mtls-not-ready.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-mount-mtls-certs.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-image-secrets-in-values.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-image-pull-secret.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-existing-cncf-networks.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-existing-cncf-networks-json.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-cncf-networks.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/hello-always.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/grpc-agent.yaml.injected
CONFLICT (content): Merge conflict in pkg/kube/inject/testdata/inject/grpc-agent.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/frontend.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/format-duration.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/explicit-security-context.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/enable-core-dump.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/enable-core-dump-annotation.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/deploymentconfig.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/deploymentconfig-with-canonical-service-label.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/daemonset.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/cronjob.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/auth.yaml.injected
Auto-merging pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected
Auto-merging pkg/istio-agent/agent.go
Auto-merging pilot/pkg/security/model/authentication.go
Auto-merging pilot/pkg/networking/core/v1alpha3/listener.go
Auto-merging pilot/pkg/networking/core/v1alpha3/cluster_test.go
CONFLICT (content): Merge conflict in pilot/pkg/networking/core/v1alpha3/cluster_test.go
Auto-merging pilot/pkg/networking/core/v1alpha3/cluster_builder_test.go
Auto-merging pilot/pkg/networking/core/v1alpha3/cluster_builder.go
Auto-merging pilot/pkg/networking/core/v1alpha3/cluster.go
CONFLICT (content): Merge conflict in pilot/pkg/networking/core/v1alpha3/cluster.go
Auto-merging manifests/charts/istiod-remote/files/injection-template.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/files/injection-template.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 use wellknown socket path for CredentialName
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".