Commit graph

4630 commits

Author SHA1 Message Date
github-actions[bot] 8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
fortuneteller2k 5476e46eb6 linux_xanmod: 5.11.14 -> 5.11.15 2021-04-17 02:09:01 +08:00
Martin Weinelt cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
Sandro 6de0cfabf9
Merge pull request #119533 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.13 -> 5.11.14
2021-04-15 23:19:35 +02:00
fortuneteller2k fc0daf4bd3 linux_xanmod: 5.11.13 -> 5.11.14 2021-04-15 19:56:59 +08:00
Atemu 87e667540a zen-kernels: 5.11.13 -> 5.11.14 2021-04-15 10:36:16 +02:00
Vladimír Čunát d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Tim Steinbach b9446623dc linux/hardened/patches/5.4: 5.4.109-hardened1 -> 5.4.111-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach cafd9c382d linux/hardened/patches/5.11: 5.11.11-hardened1 -> 5.11.13-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach e52ba0e7b6 linux/hardened/patches/5.10: 5.10.27-hardened1 -> 5.10.29-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach 517f128cc7 linux/hardened/patches/4.19: 4.19.184-hardened1 -> 4.19.186-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach bb6534f61c linux/hardened/patches/4.14: 4.14.228-hardened1 -> 4.14.230-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach 5a28ce6480 linux_latest-libre: 17920 -> 17990 2021-04-13 12:46:15 -04:00
Tim Steinbach c0a9755988 linux-rt_5_10: 5.10.25-rt35 -> 5.10.27-rt36 2021-04-13 12:46:15 -04:00
Tim Steinbach 82c70ee99a linux: 5.4.109 -> 5.4.111 2021-04-13 12:46:15 -04:00
Tim Steinbach 1c797af547 linux: 5.11.11 -> 5.11.13 2021-04-13 12:46:15 -04:00
Tim Steinbach 72fb1c7a91 linux: 5.10.27 -> 5.10.29 2021-04-13 12:46:15 -04:00
Tim Steinbach 643d4c3e4b linux: 4.9.264 -> 4.9.266 2021-04-13 12:46:15 -04:00
Tim Steinbach de1c135d6c linux: 4.4.264 -> 4.4.266 2021-04-13 12:46:15 -04:00
Tim Steinbach 1a15aabb7e linux: 4.19.184 -> 4.19.186 2021-04-13 12:46:15 -04:00
Sandro 0177881cbe
Merge pull request #119119 from Atemu/update/zen-kernels
zen-kernels: 5.11.11 -> 5.11.13
2021-04-13 01:12:48 +02:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Atemu 45a6e42ce8 zen-kernels: 5.11.11 -> 5.11.13 2021-04-11 11:48:37 +02:00
fortuneteller2k b9e7778877 linux_xanmod: 5.11.12 -> 5.11.13 2021-04-11 04:14:34 +08:00
Dmitry Kalinkin 219590673c
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix
2021-04-08 22:42:26 -04:00
github-actions[bot] 85b57e4446
Merge master into staging-next 2021-04-08 18:14:17 +00:00
Jan Tojnar 625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
Tim Steinbach d3d40b09fd kernel: Add test for RC kernels 2021-04-08 09:00:15 -04:00
Tim Steinbach 491f0a677b kernel: Add test for 4.4 2021-04-08 09:00:15 -04:00
Tim Steinbach 00c364a929 kernel: Add test for 4.9 2021-04-08 09:00:15 -04:00
Tim Steinbach 8c82c8a11c kernel: Add test for 4.14 2021-04-08 09:00:15 -04:00
Tim Steinbach 621a979bfe kernel: Add test for 4.19 2021-04-08 09:00:15 -04:00
Tim Steinbach 060e94136f kernel: Add test for 5.4 2021-04-08 09:00:15 -04:00
Tim Steinbach 1dc38fbbc2 kernel: Add test for 5.10 2021-04-08 09:00:15 -04:00
Tim Steinbach bd7fed9a2f kernel: Add tests to passthru.tests 2021-04-08 09:00:15 -04:00
github-actions[bot] bf6abedefb
Merge master into staging-next 2021-04-08 12:06:16 +00:00
fortuneteller2k 9c529802fa linux_xanmod: 5.11.10 -> 5.11.12 2021-04-08 05:39:30 +08:00
github-actions[bot] 1bd1969867
Merge staging-next into staging 2021-04-06 18:15:33 +00:00
github-actions[bot] 44d53d308b
Merge master into staging-next 2021-04-06 18:15:29 +00:00
Doron Behar 873991697f
Merge pull request #112715 from fortuneteller2k/add-xanmod-kernel
linux_xanmod: init at 5.11.10
2021-04-06 15:09:26 +00:00
Jan Tojnar 70babe5bcf Merge branch 'staging-next' into staging 2021-04-06 16:25:41 +02:00
Jan Tojnar c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Alyssa Ross 52cd3538ff linux: remove remnants of grsecurity
Nixpkgs hasn't supported grsecurity kernels since 2017, so unless
anybody is manually enabling the grsecurity feature to make these
small kernel tweaks this is dead code.

This means we don't actually support any "features" in the kernel
common-config any more, but I've left the argument there because it's
conceivable we could have some again in future.
2021-04-06 09:48:56 +00:00
fortuneteller2k 6ce986c934 linux_xanmod: init at 5.11.10 2021-04-06 10:47:28 +08:00
Sandro 004f305383
Merge pull request #118161 from Atemu/update/zen-kernels
zen-kernels: 5.11.8 -> 5.11.11
2021-04-06 03:15:37 +02:00
Martin Weinelt 7b6416657d
Merge pull request #118548 from mweinelt/raspberrypi 2021-04-06 01:51:05 +02:00
Ali Abrar 3b11170112 linux-testing: 5.12-rc4 -> 5.12-rc6 2021-04-05 13:10:37 -04:00
Tim Steinbach b60a941186 linux/hardened/patches/5.4: 5.4.108-hardened1 -> 5.4.109-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach feafbb7603 linux/hardened/patches/5.11: 5.11.10-hardened1 -> 5.11.11-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach 3c47939956 linux/hardened/patches/5.10: 5.10.26-hardened1 -> 5.10.27-hardened1 2021-04-05 10:02:50 -04:00