OCPBUGS-77179: Synchronize From Upstream Repositories

[openshift-bot]

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

[openshift-ci-robot]

@openshift-bot: This pull request explicitly references no jira issue.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-ci]

@openshift-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-sigs/prow repository.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 1c041cb3-7252-4c32-88ad-e6e00f99ef4d

📥 Commits

Reviewing files that changed from the base of the PR and between 6087955 and 4235f8c.

⛔ Files ignored due to path filters (38)

• go.sum is excluded by !**/*.sum
• staging/operator-lifecycle-manager/go.sum is excluded by !**/*.sum
• vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/net/http2/http2.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/net/http2/server.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/net/http2/transport.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/net/http2/writesched.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/net/http2/writesched_random.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/cpu/asm_darwin_arm64_gc.s is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/cpu/cpu_arm64.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/cpu/cpu_darwin_arm64.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/cpu/cpu_other_arm64.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/cpu/syscall_darwin_arm64_gc.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/plan9/syscall_plan9.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/unix/ztypes_linux.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/windows/aliases.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/windows/registry/key.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/sys/windows/syscall_windows.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/go/ast/inspector/cursor.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/go/ast/inspector/inspector.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/go/ast/inspector/iter.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/go/packages/packages.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/go/types/objectpath/objectpath.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/aliases/aliases.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/aliases/aliases_go122.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/event/core/event.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/event/keys/keys.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/event/label/label.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/gcimporter/iexport.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/gcimporter/iimport.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/stdlib/deps.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/typeparams/free.go is excluded by !vendor/**, !**/vendor/**
• vendor/golang.org/x/tools/internal/typesinternal/types.go is excluded by !vendor/**, !**/vendor/**
• vendor/modules.txt is excluded by !vendor/**, !**/vendor/**

📒 Files selected for processing (4)

• go.mod
• staging/operator-lifecycle-manager/go.mod
• staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go
• staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker_test.go

✅ Files skipped from review due to trivial changes (2)

• staging/operator-lifecycle-manager/go.mod
• go.mod

🚧 Files skipped from review as they are similar to previous changes (1)

• staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker_test.go

---

Walkthrough

Bumped several indirect golang.org/x/* module versions in root and staging go.mod files. Added a nil-check in sortUnpackJobs to fall back to Job CreationTimestamp when JobFailed conditions are absent, and extended tests to verify ordering of multiple non-failed jobs by creation time.

Changes

Cohort / File(s)	Summary
Dependency updates go.mod, staging/operator-lifecycle-manager/go.mod	Updated indirect golang.org/x/* dependency versions: golang.org/x/crypto v0.48.0→v0.49.0, golang.org/x/net v0.51.0→v0.52.0, golang.org/x/sys v0.41.0→v0.42.0, golang.org/x/term v0.40.0→v0.41.0, golang.org/x/text v0.34.0→v0.35.0, golang.org/x/tools v0.41.0→v0.42.0.
Bundle unpacker logic & tests staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go, staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker_test.go	Added nil-check in sortUnpackJobs to use CreationTimestamp when JobFailed condition is missing on both jobs; updated test helper to set CreationTimestamp and added a case asserting multiple non-failed jobs are sorted by creation time.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• DOWNSTREAM_OWNERS

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

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• DOWNSTREAM_OWNERS

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

[jianzhangbjz]

/retitle OCPBUGS-77179: Synchronize From Upstream Repositories

[openshift-ci-robot]

@openshift-bot: This pull request references Jira Issue OCPBUGS-77179, which is invalid:

• expected the bug to target the "4.22.0" version, but no target version was set

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.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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.

[jianzhangbjz]

/retest-required

[jianzhangbjz]

/jira refresh

[openshift-ci-robot]

@jianzhangbjz: This pull request references Jira Issue OCPBUGS-77179, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

Details

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

[openshift-ci-robot]

@openshift-bot: This pull request explicitly references no jira issue.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-ci]

New changes are detected. LGTM label has been removed.

[jianzhangbjz]

/retitle OCPBUGS-77179: Synchronize From Upstream Repositories

[openshift-ci-robot]

@openshift-bot: This pull request references Jira Issue OCPBUGS-77179, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-ci]

New changes are detected. LGTM label has been removed.

[openshift-ci-robot]

@openshift-bot: This pull request explicitly references no jira issue.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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.

[jianzhangbjz]

/retest-required

[jianzhangbjz]

/retitle OCPBUGS-77179: Synchronize From Upstream Repositories

[openshift-ci-robot]

@openshift-bot: This pull request references Jira Issue OCPBUGS-77179, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-ci]

@openshift-bot: all tests passed!

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

[openshift-ci-robot]

@openshift-bot: This pull request explicitly references no jira issue.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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.

[jianzhangbjz]

/verified by @jianzhangbjz

[openshift-ci-robot]

@jianzhangbjz: This PR has been marked as verified by @jianzhangbjz.

Details

In response to this:

/verified by @jianzhangbjz

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.

[jianzhangbjz]

/retitle OCPBUGS-77179: Synchronize From Upstream Repositories

[openshift-ci-robot]

@openshift-bot: This pull request references Jira Issue OCPBUGS-77179, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-ci-robot]

@openshift-bot: Jira Issue OCPBUGS-77179: All pull requests linked via external trackers have merged:

• operator-framework/operator-lifecycle-manager#3793
• openshift/operator-framework-olm#1260

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

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date	Commit	Author	Message
2026-03-18 13:38:42	operator-framework/operator-lifecycle-manager@778ed49	Jian Zhang	Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
2026-03-18 14:43:26	operator-framework/operator-lifecycle-manager@59732f5	dependabot[bot]	🌱 Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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.

[jianzhangbjz]

/cherry-pick release-4.21

[openshift-cherrypick-robot]

@jianzhangbjz: #1260 failed to apply on top of branch "release-4.21":

Applying: Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
Applying: seedling: Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/operator-lifecycle-manager/go.mod
M	staging/operator-lifecycle-manager/go.sum
M	vendor/golang.org/x/net/http2/http2.go
M	vendor/golang.org/x/net/http2/server.go
M	vendor/golang.org/x/net/http2/transport.go
M	vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go
M	vendor/golang.org/x/sys/cpu/cpu_arm64.go
M	vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go
M	vendor/golang.org/x/sys/cpu/cpu_other_arm64.go
M	vendor/golang.org/x/sys/windows/syscall_windows.go
M	vendor/golang.org/x/tools/go/ast/inspector/cursor.go
M	vendor/golang.org/x/tools/go/packages/packages.go
M	vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
M	vendor/golang.org/x/tools/internal/event/label/label.go
M	vendor/golang.org/x/tools/internal/gcimporter/iexport.go
M	vendor/golang.org/x/tools/internal/gcimporter/iimport.go
M	vendor/golang.org/x/tools/internal/stdlib/deps.go
M	vendor/golang.org/x/tools/internal/typesinternal/types.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/tools/internal/typesinternal/types.go
Auto-merging vendor/golang.org/x/tools/internal/stdlib/deps.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/tools/internal/stdlib/deps.go
Auto-merging vendor/golang.org/x/tools/internal/gcimporter/iimport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/tools/internal/gcimporter/iimport.go
Auto-merging vendor/golang.org/x/tools/internal/gcimporter/iexport.go
Auto-merging vendor/golang.org/x/tools/internal/event/label/label.go
Removing vendor/golang.org/x/tools/internal/aliases/aliases_go122.go
Auto-merging vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
Auto-merging vendor/golang.org/x/tools/go/packages/packages.go
Auto-merging vendor/golang.org/x/tools/go/ast/inspector/cursor.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/cpu/cpu_other_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/cpu/cpu_other_arm64.go
Auto-merging vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go
Auto-merging vendor/golang.org/x/sys/cpu/cpu_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/cpu/cpu_arm64.go
Auto-merging vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go
Auto-merging vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/golang.org/x/net/http2/http2.go
Auto-merging staging/operator-lifecycle-manager/go.sum
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/go.sum
Auto-merging staging/operator-lifecycle-manager/go.mod
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/go.mod
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
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 seedling: Bump golang.org/x/net from 0.51.0 to 0.52.0 (#3797)

Details

In response to this:

/cherry-pick release-4.21

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-sigs/prow repository.