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.

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

[release-0.3] Currently supporting TCP protocol, add the corresponding checks #313

Closed
kmesh-bot opened this issue May 10, 2024 · 5 comments
Assignees

Comments

@kmesh-bot
Copy link
Collaborator

Manual cherrypick required.

#311 failed to apply on top of branch "release-0.3":

Applying: Currently supporting TCP protocol, add the corresponding checks to the relevant process.
Using index info to reconstruct a base tree...
M	bpf/kmesh/cgroup_sock.c
M	bpf/kmesh/workload/cgroup_sock.c
Falling back to patching base and 3-way merge...
Auto-merging bpf/kmesh/workload/cgroup_sock.c
CONFLICT (content): Merge conflict in bpf/kmesh/workload/cgroup_sock.c
Auto-merging bpf/kmesh/cgroup_sock.c
CONFLICT (content): Merge conflict in bpf/kmesh/cgroup_sock.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Currently supporting TCP protocol, add the corresponding checks to the relevant process.
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".

@hzxuzhonghu
Copy link
Member

@supercharge-xsy Seems there is a conflict cherryping pick

@supercharge-xsy
Copy link
Contributor

@supercharge-xsy Seems there is a conflict cherryping pick

will fix it

@supercharge-xsy
Copy link
Contributor

@hzxuzhonghu #314

@hzxuzhonghu
Copy link
Member

fixed

/close

@kmesh-bot
Copy link
Collaborator Author

@hzxuzhonghu: Closing this issue.

In response to this:

fixed

/close

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
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants