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: e220cc070093
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bbfa82c2f8e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 12, 2020

  1. linux_mptcp_94: remove (outdated) 

    few years old by now, use linux_mptcp_95 instead.
    Matthieu Coudron committed Nov 12, 2020
    Copy the full SHA
    db215ca View commit details

  2. linux_mptcp_5_9: MPTCP in upstream linux 

    linux_mptcp_5_9 enables Multipath TCP in the upstream kernel.

I keep linux_mptcp_95 even if it is out of tree because it has "more" features
than linux_mptcp_5_9.
    Matthieu Coudron committed Nov 12, 2020
    Copy the full SHA
    015939b View commit details

  3. Merge pull request #103232 from teto/mptcp_official 

    linux_mptcp_5_9: init upstream multipath TCP at 5.9
    @teto
    teto authored Nov 12, 2020
    Copy the full SHA
    2bbfa82 View commit details
Showing with 5 additions and 38 deletions.
  1. +0 −26 pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
  2. +5 −12 pkgs/top-level/all-packages.nix
26 changes: 0 additions & 26 deletions pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
View file

This file was deleted.

17 changes: 5 additions & 12 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17987,18 +17987,11 @@ in

linux_mptcp = linux_mptcp_95;

linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
linux_mptcp_5_9 = linux_5_9.override {
structuredExtraConfig = with lib.kernel; {
MPTCP = yes;
MPTCP_IPV6 = yes;
};
};

linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {