diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-10-27 17:08:03 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-10-27 17:08:03 +0200 |
| commit | 81a7a805e7ea1cf743b22acc7d5cd1d51613cf04 (patch) | |
| tree | a8731db1c02dba669f76ca9f7a85d54676f2bb60 /pkgs/kernel/linux-4.7.nix | |
| parent | e27c4cdfbe994a259b77cb4f71c1746552f639f3 (diff) | |
pkgs/linux-4.7: Bring back bridge STP helper patch
This reverts commit e27c4cdfbe994a259b77cb4f71c1746552f639f3. I was wrong about this patch being applied upstream, but it turns out that somehow both of these patches are opplied twice, so we'll need to deduplicate the patch list or even better not introduce these duplicates in the first place. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/kernel/linux-4.7.nix')
| -rw-r--r-- | pkgs/kernel/linux-4.7.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/kernel/linux-4.7.nix b/pkgs/kernel/linux-4.7.nix index 19a80d0f..6f6de003 100644 --- a/pkgs/kernel/linux-4.7.nix +++ b/pkgs/kernel/linux-4.7.nix @@ -13,6 +13,7 @@ in import generic (args // rec { }; kernelPatches = (args.kernelPatches or []) ++ [ + pkgs.kernelPatches.bridge_stp_helper pkgs.kernelPatches.cpu-cgroup-v2."4.7" ]; |