diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
| commit | 00df204c82bd6d585c3f19d1a31588fa72519184 (patch) | |
| tree | 4201fed8adf0505e787b9cf335cd52a7ad657570 /pkgs/os-specific/linux/kernel/patches.nix | |
| parent | 8591db4b10e50ad3b61b1708787e4de314424d5d (diff) | |
| parent | cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 (diff) | |
| download | nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.gz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.bz2 nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.lz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.xz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.zst nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel/patches.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 998717b1f5d4..2bb8fb570003 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.39"; - revision = "201504190814"; + { kversion = "3.14.40"; + revision = "201504290821"; branch = "stable"; - sha256 = "0pjq0ggifh6hp5y62dl0ydskpmsmzj1cxxjaaqs6fpwn5ndsdji7"; + sha256 = "0382ydr1dshjmwggx5a6ywrdr7qv52w178ify60qw59lrphbdkls"; }; grsecurity_unstable = grsecPatch - { kversion = "3.19.5"; - revision = "201504190814"; + { kversion = "3.19.6"; + revision = "201504290821"; branch = "test"; - sha256 = "0wj9bximhs41b11hh113mishmc1ya8bncc0v91cbrivx5y5hjpz0"; + sha256 = "0nya84cpj2cgncchywfysvmzx5m3wl034f6p7zfxj9l6jhjdcd6q"; }; grsec_fix_path = |