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

feat: add command to enable mptcp (backport #4014) #4020

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2024

Overview

adds a makefile command to enable and disable mptcp over different ports (not interfaces) for linux kernels greater than 5.6

not required, but potentially useful


This is an automatic backport of pull request #4014 done by Mergify.

## Overview

adds a makefile command to enable and disable mptcp over different ports
(not interfaces) for linux kernels greater than 5.6

not required, but potentially useful

(cherry picked from commit 808d0f2)

# Conflicts:
#	Makefile
Copy link
Contributor Author

mergify bot commented Nov 1, 2024

Cherry-pick of 808d0f2 has failed:

On branch mergify/bp/v2.x/pr-4014
Your branch is up to date with 'origin/v2.x'.

You are currently cherry-picking commit 808d0f21.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team as a code owner November 1, 2024 19:42
@mergify mergify bot added the conflicts label Nov 1, 2024
@mergify mergify bot requested review from cmwaters and ninabarbakadze November 1, 2024 19:42
@github-actions github-actions bot added the bot item was created by a bot label Nov 1, 2024
Copy link
Member

@evan-forbes evan-forbes left a comment

Choose a reason for hiding this comment

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

we don't really have to merge this

@evan-forbes
Copy link
Member

not worth fixing the conflict tbh

@evan-forbes evan-forbes closed this Nov 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant