Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b41ede5e3a39
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01e6e4c5e943
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 26, 2018

  1. Copy the full SHA
    a050133 View commit details

Commits on May 4, 2018

  1. Merge pull request #39541 from teto/mptcp_scheduler

    linux-mptcp: enable advanced schedulers
    xeji authored May 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    01e6e4c View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/os-specific/linux/kernel/linux-mptcp.nix
3 changes: 1 addition & 2 deletions pkgs/os-specific/linux/kernel/linux-mptcp.nix
Original file line number Diff line number Diff line change
@@ -33,8 +33,7 @@ buildLinux (rec {
DEFAULT_MPTCP_PM default
# MPTCP scheduler selection.
# Disabled as the only non-default is the useless round-robin.
MPTCP_SCHED_ADVANCED n
MPTCP_SCHED_ADVANCED y
DEFAULT_MPTCP_SCHED default
# Smarter TCP congestion controllers