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

[23.0 backport] vendor: github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2 #45323

Merged
merged 1 commit into from
Apr 13, 2023

Conversation

thaJeztah
Copy link
Member

⚠️ Minor conflict (adjacent lines) in vendor.mod and vendor.sum, due to these
commits not (yet) being in this branch;

We might still consider cherry-picking those, but we can probably do so separately (and fix the minor conflicts for that)


  • Prevent from descriptor leak
  • Fixes optlen in getsockopt() for s390x

full diff: ishidawataru/sctp@9a39160...7ff4192

(cherry picked from commit 893d284)

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

- Prevent from descriptor leak
- Fixes optlen in getsockopt() for s390x

full diff: ishidawataru/sctp@9a39160...7ff4192

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 893d284)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 23.0.4 milestone Apr 13, 2023
@thaJeztah thaJeztah changed the title vendor: github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2 [23.0 backport] vendor: github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2 Apr 13, 2023
Copy link
Member

@neersighted neersighted left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM; agreed on the order of operations re: containerd 1.7

@thaJeztah
Copy link
Member Author

Yes, I definitely wouldn't want to backport all of that other PR (not containerd 1.7; 1.6 is LTS and fine to use), but there's some other dependencies that might be good to update.

Backporting those would only cause conflicts in vendor.mod / vendor.sum (or vendor/modules.txt) so trivial to resolve (and not really worth mentioning in most cases), so not too concerned about that.

@thaJeztah thaJeztah merged commit 90e8a0b into moby:23.0 Apr 13, 2023
86 checks passed
@thaJeztah thaJeztah deleted the 23.0_backport_vendor_sctp branch April 13, 2023 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants