Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-21984: Bump golang.org/x/net to v0.19.0 #41

Merged
merged 1 commit into from Dec 21, 2023
Merged

OCPBUGS-21984: Bump golang.org/x/net to v0.19.0 #41

merged 1 commit into from Dec 21, 2023

Conversation

racheljpg
Copy link

This is a PR to bump the golang.org/x/net dependency to v0.19.0. Thanks!

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 14, 2023
@openshift-ci-robot
Copy link

@racheljpg: This pull request references Jira Issue OCPBUGS-21984, which is invalid:

  • expected the bug to target either version "4.16." or "openshift-4.16.", but it targets "4.15.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is a PR to bump the golang.org/x/net dependency to v0.19.0. Thanks!

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@racheljpg racheljpg changed the base branch from master to release-4.15 December 14, 2023 13:20
@openshift-ci-robot
Copy link

@racheljpg: This pull request references Jira Issue OCPBUGS-21984, which is invalid:

  • expected Jira Issue OCPBUGS-21984 to depend on a bug targeting a version in 4.16.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

This is a PR to bump the golang.org/x/net dependency to v0.19.0. Thanks!

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@racheljpg
Copy link
Author

/jira refresh

@openshift-ci-robot
Copy link

@racheljpg: This pull request references Jira Issue OCPBUGS-21984, which is invalid:

  • expected dependent Jira Issue OCPBUGS-25457 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is New instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@racheljpg
Copy link
Author

/retest

@racheljpg
Copy link
Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 15, 2023
@openshift-ci-robot
Copy link

@racheljpg: This pull request references Jira Issue OCPBUGS-21984, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-25457 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-25457 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @miyadav

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot requested a review from miyadav December 15, 2023 13:48
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Dec 15, 2023

@racheljpg: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-alibabacloud 0d65dd1 link false /test e2e-alibabacloud

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@JoelSpeed
Copy link

/approve
/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 19, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 19, 2023
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Dec 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 19, 2023
@RadekManak
Copy link

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link

@RadekManak: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sunzhaohua2
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 21, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit 387bdc5 into openshift:release-4.15 Dec 21, 2023
6 of 7 checks passed
@openshift-ci-robot
Copy link

@racheljpg: Jira Issue OCPBUGS-21984: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-21984 has been moved to the MODIFIED state.

In response to this:

This is a PR to bump the golang.org/x/net dependency to v0.19.0. Thanks!

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

@RadekManak: #41 failed to apply on top of branch "release-4.14":

Applying: UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/golang.org/x/net/context/go17.go
M	vendor/golang.org/x/net/html/doc.go
M	vendor/golang.org/x/net/html/render.go
M	vendor/golang.org/x/net/html/token.go
M	vendor/golang.org/x/net/http2/server.go
M	vendor/golang.org/x/net/http2/transport.go
A	vendor/golang.org/x/sys/execabs/execabs_go118.go
A	vendor/golang.org/x/sys/execabs/execabs_go119.go
M	vendor/golang.org/x/sys/plan9/syscall.go
A	vendor/golang.org/x/sys/unix/asm_bsd_ppc64.s
M	vendor/golang.org/x/sys/unix/dirent.go
M	vendor/golang.org/x/sys/unix/gccgo.go
M	vendor/golang.org/x/sys/unix/gccgo_c.c
M	vendor/golang.org/x/sys/unix/ioctl.go
M	vendor/golang.org/x/sys/unix/ioctl_linux.go
M	vendor/golang.org/x/sys/unix/ioctl_zos.go
M	vendor/golang.org/x/sys/unix/mkall.sh
M	vendor/golang.org/x/sys/unix/mkerrors.sh
M	vendor/golang.org/x/sys/unix/ptrace_darwin.go
M	vendor/golang.org/x/sys/unix/ptrace_ios.go
M	vendor/golang.org/x/sys/unix/sockcmsg_unix.go
M	vendor/golang.org/x/sys/unix/syscall.go
M	vendor/golang.org/x/sys/unix/syscall_aix.go
M	vendor/golang.org/x/sys/unix/syscall_bsd.go
M	vendor/golang.org/x/sys/unix/syscall_darwin.go
M	vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
M	vendor/golang.org/x/sys/unix/syscall_dragonfly.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
A	vendor/golang.org/x/sys/unix/syscall_hurd.go
A	vendor/golang.org/x/sys/unix/syscall_hurd_386.go
M	vendor/golang.org/x/sys/unix/syscall_illumos.go
M	vendor/golang.org/x/sys/unix/syscall_linux.go
M	vendor/golang.org/x/sys/unix/syscall_linux_386.go
M	vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_arm.go
M	vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
M	vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
M	vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/syscall_netbsd.go
M	vendor/golang.org/x/sys/unix/syscall_openbsd.go
A	vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go
A	vendor/golang.org/x/sys/unix/syscall_openbsd_ppc64.go
A	vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go
M	vendor/golang.org/x/sys/unix/syscall_solaris.go
M	vendor/golang.org/x/sys/unix/syscall_unix.go
M	vendor/golang.org/x/sys/unix/syscall_unix_gc.go
M	vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
M	vendor/golang.org/x/sys/unix/sysvshm_unix.go
M	vendor/golang.org/x/sys/unix/timestruct.go
M	vendor/golang.org/x/sys/unix/xattr_bsd.go
M	vendor/golang.org/x/sys/unix/zerrors_linux.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
M	vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
M	vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
M	vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go
M	vendor/golang.org/x/sys/unix/zerrors_openbsd_mips64.go
A	vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go
A	vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go
M	vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
M	vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
M	vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
M	vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
M	vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
M	vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
M	vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
M	vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
M	vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
A	vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
M	vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
M	vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
M	vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
M	vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm64.go
M	vendor/golang.org/x/sys/unix/zsysctl_openbsd_mips64.go
A	vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go
A	vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
M	vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
M	vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm64.go
M	vendor/golang.org/x/sys/unix/zsysnum_openbsd_mips64.go
A	vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go
A	vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_386.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
M	vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
A	vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go
A	vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go
M	vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go
M	vendor/golang.org/x/sys/windows/syscall.go
M	vendor/golang.org/x/sys/windows/syscall_windows.go
M	vendor/golang.org/x/sys/windows/types_windows.go
M	vendor/golang.org/x/sys/windows/zsyscall_windows.go
M	vendor/golang.org/x/text/internal/language/compact/tables.go
M	vendor/golang.org/x/text/internal/language/tables.go
M	vendor/golang.org/x/text/language/match.go
M	vendor/golang.org/x/text/language/tables.go
M	vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
A	vendor/golang.org/x/text/width/tables10.0.0.go
A	vendor/golang.org/x/text/width/tables11.0.0.go
A	vendor/golang.org/x/text/width/tables12.0.0.go
A	vendor/golang.org/x/text/width/tables13.0.0.go.git/rebase-apply/patch:21126: new blank line at EOF.
+
.git/rebase-apply/patch:21377: new blank line at EOF.
+
.git/rebase-apply/patch:21628: new blank line at EOF.
+
.git/rebase-apply/patch:21879: new blank line at EOF.
+
.git/rebase-apply/patch:22130: new blank line at EOF.
+
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.

A	vendor/golang.org/x/text/width/tables9.0.0.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables9.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/text/width/tables9.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables13.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/text/width/tables13.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables12.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/text/width/tables12.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables11.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/text/width/tables11.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables10.0.0.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/text/width/tables10.0.0.go left in tree.
Auto-merging vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
Auto-merging vendor/golang.org/x/text/language/tables.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/text/language/tables.go
Auto-merging vendor/golang.org/x/text/language/match.go
Auto-merging vendor/golang.org/x/text/internal/language/tables.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/text/internal/language/tables.go
Auto-merging vendor/golang.org/x/text/internal/language/compact/tables.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/text/internal/language/compact/tables.go
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_openbsd_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsysctl_openbsd_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zerrors_openbsd_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/xattr_bsd.go
Auto-merging vendor/golang.org/x/sys/unix/timestruct.go
Auto-merging vendor/golang.org/x/sys/unix/sysvshm_unix.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_unix_gc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_unix_gc.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_unix.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_solaris.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_solaris.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/syscall_openbsd_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_openbsd_mips64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/syscall_openbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_netbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_illumos.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/syscall_hurd_386.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/syscall_hurd_386.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/syscall_hurd.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/unix/syscall_hurd.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_dragonfly.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_bsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_aix.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_aix.go
Auto-merging vendor/golang.org/x/sys/unix/syscall.go
Auto-merging vendor/golang.org/x/sys/unix/sockcmsg_unix.go
Auto-merging vendor/golang.org/x/sys/unix/ptrace_ios.go
Auto-merging vendor/golang.org/x/sys/unix/ptrace_darwin.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/sys/unix/mkall.sh
Auto-merging vendor/golang.org/x/sys/unix/ioctl_zos.go
Auto-merging vendor/golang.org/x/sys/unix/ioctl_unsigned.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ioctl_unsigned.go
Auto-merging vendor/golang.org/x/sys/unix/ioctl_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ioctl_linux.go
Auto-merging vendor/golang.org/x/sys/unix/gccgo_c.c
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/gccgo_c.c
Auto-merging vendor/golang.org/x/sys/unix/gccgo.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/gccgo.go
Auto-merging vendor/golang.org/x/sys/unix/dirent.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/dirent.go
Auto-merging vendor/golang.org/x/sys/plan9/syscall.go
Auto-merging vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s
Removing vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/execabs/execabs_go119.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/execabs/execabs_go119.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/execabs/execabs_go118.go deleted in HEAD and modified in UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0. Version UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0 of vendor/golang.org/x/sys/execabs/execabs_go118.go left in tree.
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/server.go
Removing vendor/golang.org/x/net/http2/not_go118.go
Removing vendor/golang.org/x/net/http2/not_go115.go
Removing vendor/golang.org/x/net/http2/not_go111.go
Removing vendor/golang.org/x/net/http2/go118.go
Removing vendor/golang.org/x/net/http2/go115.go
Removing vendor/golang.org/x/net/http2/go111.go
Removing vendor/golang.org/x/net/http2/Makefile
Removing vendor/golang.org/x/net/http2/Dockerfile
Auto-merging vendor/golang.org/x/net/html/token.go
Auto-merging vendor/golang.org/x/net/html/render.go
Auto-merging vendor/golang.org/x/net/html/doc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/html/doc.go
Auto-merging vendor/golang.org/x/net/context/go17.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: <carry>: Bump golang.org/x/net to v0.19.0
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".

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-alibaba-cloud-controller-manager-container-v4.15.0-202312211310.p0.g387bdc5.assembly.stream for distgit ose-alibaba-cloud-controller-manager.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nrb nrb Awaiting requested review from nrb

@RadekManak RadekManak Awaiting requested review from RadekManak

@miyadav miyadav Awaiting requested review from miyadav

Assignees

@jhou1 jhou1

@JoelSpeed JoelSpeed

@sunzhaohua2 sunzhaohua2

@miyadav miyadav

@huali9 huali9

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@racheljpg @openshift-ci-robot @JoelSpeed @RadekManak @openshift-cherrypick-robot @sunzhaohua2 @openshift-bot @jhou1 @miyadav @huali9