Skip to content

Conversation

@ashwindasr
Copy link
Contributor

@ashwindasr ashwindasr commented Nov 21, 2025

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 21, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign joepvd for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@ashwindasr ashwindasr merged commit 490eda3 into openshift-eng:openshift-4.20 Nov 21, 2025
1 of 3 checks passed
@ashwindasr ashwindasr deleted the 4.20-fix-linuxptp branch November 21, 2025 23:39
@ashwindasr
Copy link
Contributor Author

/cherry-pick openshift-4.21

@openshift-cherrypick-robot

@ashwindasr: #8249 failed to apply on top of branch "openshift-4.21":

Applying: pin rpm synce4l for linux-ptp
Using index info to reconstruct a base tree...
M	images/linuxptp-daemon.yml
Falling back to patching base and 3-way merge...
Auto-merging images/linuxptp-daemon.yml
CONFLICT (content): Merge conflict in images/linuxptp-daemon.yml
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 advice.mergeConflict false"
Patch failed at 0001 pin rpm synce4l for linux-ptp

In response to this:

/cherry-pick openshift-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.

@ashwindasr
Copy link
Contributor Author

/cherry-pick openshift-4.22

@openshift-cherrypick-robot

@ashwindasr: new pull request created: #8251

In response to this:

/cherry-pick openshift-4.22

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.

@ashwindasr
Copy link
Contributor Author

/cherry-pick openshift-4.19

@openshift-cherrypick-robot

@ashwindasr: new pull request created: #8319

In response to this:

/cherry-pick openshift-4.19

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.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants