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

NO-JIRA: Auto sync upstream 2024 01 05 18 36 #27

Merged
merged 2 commits into from Jan 23, 2024
Merged

NO-JIRA: Auto sync upstream 2024 01 05 18 36 #27

merged 2 commits into from Jan 23, 2024

Conversation

davidvossel
Copy link 

NONE

@davidvossel
update golang net dependency (kubevirt#94)
93dc46c 
Signed-off-by: David Vossel <davidvossel@gmail.com>
@davidvossel
Merge remote-tracking branch 'auto-sync-script-upstream/main' into au…
6a33d71 
…to_sync_upstream_2024-01-05-18-36
@openshift-ci openshift-ci bot requested review from aglitke and ydayagi January 5, 2024 18:37
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 5, 2024
@davidvossel
Copy link
Author

/test e2e-kubevirt-aws-csi

2 similar comments
@davidvossel
Copy link
Author

/test e2e-kubevirt-aws-csi

@davidvossel
Copy link
Author

/test e2e-kubevirt-aws-csi

@davidvossel
Copy link
Author

/retest-required

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 22, 2024

@davidvossel: all tests passed!

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.

@nunnatsa
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: davidvossel, nunnatsa

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:
  • OWNERS [davidvossel,nunnatsa]

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

@davidvossel davidvossel changed the title Auto sync upstream 2024 01 05 18 36 NO-JIRA: Auto sync upstream 2024 01 05 18 36 Jan 23, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 23, 2024
@openshift-ci-robot
Copy link

@davidvossel: This pull request explicitly references no jira issue.

In response to this:

NONE

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot openshift-merge-bot bot merged commit e9eb81e into openshift:master Jan 23, 2024
4 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-kubevirt-csi-driver-container-v4.16.0-202401231834.p0.ge9eb81e.assembly.stream for distgit ose-kubevirt-csi-driver-rhel8.
All builds following this will include this PR.

@davidvossel
Copy link
Author

/cherry-pick release-4.15

@davidvossel
Copy link
Author

/cherry-pick release-4.14

@davidvossel
Copy link
Author

/cherry-pick release-4.13

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 25, 2024
Closed
@openshift-cherrypick-robot
Copy link

@davidvossel: new pull request created: #28

In response to this:

/cherry-pick release-4.15

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 openshift-cherrypick-robot mentioned this pull request Jan 25, 2024
Closed
@openshift-cherrypick-robot
Copy link

@davidvossel: new pull request created: #29

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-cherrypick-robot
Copy link

@davidvossel: #27 failed to apply on top of branch "release-4.13":

Applying: update golang net dependency (#94)
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/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
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_linux.go
A	vendor/golang.org/x/sys/unix/ioctl_signed.go
A	vendor/golang.org/x/sys/unix/ioctl_unsigned.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_aix_ppc.go
M	vendor/golang.org/x/sys/unix/syscall_aix_ppc64.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_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.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_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.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.git/rebase-apply/patch:19594: new blank line at EOF.
+
.git/rebase-apply/patch:19812: new blank line at EOF.
+
.git/rebase-apply/patch:20030: new blank line at EOF.
+
.git/rebase-apply/patch:20248: new blank line at EOF.
+
.git/rebase-apply/patch:20466: new blank line at EOF.
+
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.

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/exec_windows.go
M	vendor/golang.org/x/sys/windows/service.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/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
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/windows/service.go
Auto-merging vendor/golang.org/x/sys/windows/exec_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/exec_windows.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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go deleted in HEAD and modified in update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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
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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
Auto-merging 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
Auto-merging 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
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
Auto-merging 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
Auto-merging 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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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/zerrors_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.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
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 (modify/delete): vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go deleted in HEAD and modified in update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_netbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
Auto-merging 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
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
Auto-merging 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
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 update golang net dependency (#94). Version update golang net dependency (#94) 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 update golang net dependency (#94). Version update golang net dependency (#94) 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
CONFLICT (content): Merge conflict in 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_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
Auto-merging 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
CONFLICT (content): Merge conflict in 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
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/ioctl_signed.go deleted in HEAD and modified in update golang net dependency (#94). Version update golang net dependency (#94) of vendor/golang.org/x/sys/unix/ioctl_signed.go left in tree.
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/ioctl.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ioctl.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
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/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 update golang net dependency (#94)
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.13

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.

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

@aglitke aglitke Awaiting requested review from aglitke

@ydayagi ydayagi Awaiting requested review from ydayagi

Assignees

@nunnatsa nunnatsa

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
5 participants
@davidvossel @nunnatsa @openshift-ci-robot @openshift-bot @openshift-cherrypick-robot