Commit graph

4775 commits

Author SHA1 Message Date
TredwellGit df61f804fb linux: 4.19.188 -> 4.19.190 2021-05-09 16:51:21 +00:00
TredwellGit f1b9f8023d linux: 4.14.231 -> 4.14.232 2021-05-09 16:51:14 +00:00
Atemu 0f4f1ae3f2 linux_lqx: 5.11.18 -> 5.11.19 2021-05-09 17:10:26 +02:00
Domen Kožar 8ecb0344a0
Merge pull request #121720 from samueldr/feature/arm-stage-1-modules
installer images: Add available modules to stage-1 on ARM platforms
2021-05-07 22:01:09 +02:00
Sandro 562dac79e1
Merge pull request #121498 from Atemu/update/linux_lqx
linux_lqx: 5.11.16 -> 5.11.18
2021-05-05 23:22:43 +02:00
Samuel Dionne-Riel 7264c049c7 linux/common-config.nix: Configure for armv7l-linux too 2021-05-04 19:42:12 -04:00
Samuel Dionne-Riel 595a50fd07 linux/common-config.nix: Enable FB_SIMPLE on AArch64 2021-05-04 19:42:12 -04:00
Atemu cfb29088b4 linux_lqx: 5.11.16 -> 5.11.18 2021-05-04 15:13:54 +02:00
Atemu 1b10b0d579 kernel: clarify license 2021-05-02 14:44:54 +00:00
Tim Steinbach e1af1d1f81 linux/hardened/patches/5.4: 5.4.113-hardened1 -> 5.4.114-hardened1 2021-04-28 09:34:45 -04:00
Tim Steinbach 69984bd056 linux/hardened/patches/5.11: 5.11.15-hardened1 -> 5.11.16-hardened1 2021-04-28 09:34:45 -04:00
Tim Steinbach 4611413ec6 linux/hardened/patches/5.10: 5.10.31-hardened1 -> 5.10.32-hardened1 2021-04-28 09:34:45 -04:00
Tim Steinbach 8ee8d6e61e linux/hardened/patches/5.4: 5.4.112-hardened1 -> 5.4.113-hardened1 2021-04-28 09:34:45 -04:00
Tim Steinbach 9d47acdbc8 linux/hardened/patches/5.11: 5.11.14-hardened1 -> 5.11.15-hardened1 2021-04-28 09:34:45 -04:00
Tim Steinbach f99496d321 linux/hardened/patches/5.10: 5.10.30-hardened1 -> 5.10.31-hardened1 2021-04-28 09:34:45 -04:00
Tim Steinbach 00aa9ee2b4 linux/hardened/patches/4.19: 4.19.187-hardened1 -> 4.19.188-hardened1 2021-04-28 09:34:45 -04:00
Tim Steinbach b3e42ffea1 linux/hardened/patches/4.14: 4.14.230-hardened1 -> 4.14.231-hardened1 2021-04-28 09:34:45 -04:00
Tim Steinbach 2e7331db4c linux-rt_5_4: 5.4.106-rt54 -> 5.4.109-rt56 2021-04-28 09:34:45 -04:00
Tim Steinbach c6963522e0 linux-rt: Avoid RCs 2021-04-28 09:34:45 -04:00
Tim Steinbach d70dced4fe linux-rt_5_10: 5.10.27-rt36 -> 5.10.30-rt37 2021-04-28 09:34:45 -04:00
Tim Steinbach 81ef99ec75 linux: 5.4.112 -> 5.4.114 2021-04-28 09:34:45 -04:00
Tim Steinbach 079fca1541 linux: 5.11.14 -> 5.11.16 2021-04-28 09:34:45 -04:00
Tim Steinbach e77d44c103 linux: 5.10.30 -> 5.10.32 2021-04-28 09:34:45 -04:00
Tim Steinbach 1904447d73 linux: 4.9.266 -> 4.9.267 2021-04-28 09:34:45 -04:00
Tim Steinbach fde3ac0f8e linux: 4.4.266 -> 4.4.267 2021-04-28 09:34:45 -04:00
Tim Steinbach c38311d1f6 linux: 4.19.187 -> 4.19.188 2021-04-28 09:34:45 -04:00
Tim Steinbach 125bbf0752 linux: 4.14.230 -> 4.14.231 2021-04-28 09:34:45 -04:00
davidak 037cf652f3
Merge pull request #120584 from Atemu/update/zen-kernels
zen-kernels: 5.11.15 -> 5.11.16
2021-04-26 13:42:23 +02:00
Atemu 6c04559dae zen-kernels: 5.11.15 -> 5.11.16 2021-04-25 12:20:17 +02:00
github-actions[bot] 120744d620
Merge master into staging-next 2021-04-22 12:06:24 +00:00
fortuneteller2k 1dfdf07669 linux_xanmod: 5.11.15 -> 5.11.16 2021-04-22 15:39:14 +08:00
github-actions[bot] b08c9b444b
Merge master into staging-next 2021-04-20 18:13:16 +00:00
Tim Steinbach d9448c95c5 linux/hardened/patches/5.4: 5.4.111-hardened1 -> 5.4.112-hardened1 2021-04-20 09:33:47 -04:00
Tim Steinbach bbb8deabb3 linux/hardened/patches/5.11: 5.11.13-hardened1 -> 5.11.14-hardened1 2021-04-20 09:33:47 -04:00
Tim Steinbach 0d9829b7e5 linux/hardened/patches/5.10: 5.10.29-hardened1 -> 5.10.30-hardened1 2021-04-20 09:33:47 -04:00
Tim Steinbach b67475c4cd linux/hardened/patches/4.19: 4.19.186-hardened1 -> 4.19.187-hardened1 2021-04-20 09:33:47 -04:00
Tim Steinbach 4cd76dbf0c linux: 5.4.111 -> 5.4.112 2021-04-20 09:33:47 -04:00
Tim Steinbach d48f518a08 linux: 5.11.13 -> 5.11.14 2021-04-20 09:33:47 -04:00
Tim Steinbach ed540048c8 linux: 5.10.29 -> 5.10.30 2021-04-20 09:33:47 -04:00
Tim Steinbach 1831a7e8cc linux: 4.19.186 -> 4.19.187 2021-04-20 09:33:47 -04:00
github-actions[bot] 6ef7c23763
Merge master into staging-next 2021-04-19 18:11:51 +00:00
Sandro 2ef3a9fa87
Merge pull request #119873 from Atemu/update/zen-kernels
zen-kernels: 5.11.14 -> 5.11.15
2021-04-19 19:19:33 +02:00
Linus Heckemann 50d091cc65
Merge pull request #119770 from qzle/ramdisks
kernel: Remove CONFIG_BLK_DEV_RAM=y (remove /dev/ram* devices)
2021-04-19 14:17:42 +02:00
Jens Nolte 610d831a4b kernel: Remove CONFIG_BLK_DEV_RAM=y (remove /dev/ram* devices)
This option allows to use portions of the system RAM as block devices.
It was configured to 'y' (built-in, therefore not unloadable or
reconfigurable) and configured 16 4MB RAM disks which, to my knowledge,
currently have no purpose in NixOS.

Removing the option restores it to it's default value of 'm', which
enables it to be loaded at runtime (which is also required to be able to
change it's configuration without rebuilding the kernel).
2021-04-18 05:34:55 +02:00
Atemu 0036ccebc2 zen-kernels: 5.11.14 -> 5.11.15 2021-04-17 20:45:33 +02:00
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
Tim Steinbach 114cb322ac linux/hardened/patches/4.19: 4.19.183-hardened1 -> 4.19.184-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach fcd5f88906 linux/hardened/patches/4.14: 4.14.227-hardened1 -> 4.14.228-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach 41d954afb5 linux: 5.4.108 -> 5.4.109 2021-04-05 10:02:50 -04:00
Tim Steinbach 8d0a705894 linux: 5.11.10 -> 5.11.11 2021-04-05 10:02:50 -04:00
Tim Steinbach ccff62d486 linux: 5.10.26 -> 5.10.27 2021-04-05 10:02:50 -04:00
Tim Steinbach 69da7b41ae linux: 4.9.263 -> 4.9.264 2021-04-05 10:02:50 -04:00
Tim Steinbach e1dda91015 linux: 4.4.263 -> 4.4.264 2021-04-05 10:02:50 -04:00
Tim Steinbach 94c5559e27 linux: 4.19.183 -> 4.19.184 2021-04-05 10:02:50 -04:00
Tim Steinbach 5538128395 linux: 4.14.227 -> 4.14.228 2021-04-05 10:02:50 -04:00
Alyssa Ross 25208eeaba linux: remove xen_dom0 feature entirely
Xen is now enabled unconditionally on kernels that support it, so the
xen_dom0 feature doesn't do anything.  The isXen attribute will now
produce a deprecation warning and unconditionally return true.
Passing in a custom value for isXen is no longer supported.
2021-04-05 09:25:39 +00:00
Martin Weinelt 37fbf3de41
linux_rpi: 5.10.11 -> 5.10.17 2021-04-05 05:39:36 +02:00
Martin Weinelt 791c91ff52
Merge pull request #113363 from mweinelt/rpi 2021-04-05 05:07:37 +02:00
Alyssa Ross 5f24024de6 linux: enable Xen everywhere it can be
I don't think there's any reason to have a seperate kernel variant
because of this, with all the maintenance burden that imposes.  Debian
and Fedora both enable all these options on their normal kernels.

Alias the Linux Xen attributes, so this change should be seemless for
people who were using the Xen kernels up to now.

All the Xen options are marked as optional anyway, so it should be
fine to try to enable them on non-x86 platforms as well.

Fixes: https://github.com/NixOS/nixpkgs/issues/115182
2021-04-04 14:26:21 +00:00
github-actions[bot] 3e45982f7a
Merge master into staging-next 2021-04-04 12:06:01 +00:00
Vladimír Čunát 7a3f21c1e4
linux: don't compress by ZSTD on 32-bit
It doesn't build on i686 and I don't consider it worth deep
investigation.  I tried a VM test, too (nixosTests.knot).
2021-04-03 16:11:17 +02:00
github-actions[bot] 636e58e31b
Merge staging-next into staging 2021-04-02 00:21:46 +00:00
Alyssa Ross f67748ecda
Fix some typos in comments 2021-04-01 18:34:27 +00:00
Atemu 615cad0967 zen-kernels: 5.11.8 -> 5.11.11 2021-03-31 20:24:45 +02:00
github-actions[bot] 5abd5f5ab0
Merge staging-next into staging 2021-03-31 18:15:02 +00:00
Tim Steinbach efd9121787 linux/hardened/patches/5.11: 5.11.9-hardened1 -> 5.11.10-hardened1 2021-03-31 11:25:46 -04:00
Tim Steinbach 5368c6d11e linux/hardened/patches/5.10: 5.10.25-hardened1 -> 5.10.26-hardened1 2021-03-31 11:25:46 -04:00
Tim Steinbach 2a47ac7922 linux-rt_5_10: 5.10.21-rt34 -> 5.10.25-rt35 2021-03-31 11:25:46 -04:00
Tim Steinbach 623687ca7f linux: 5.11.9 -> 5.11.10 2021-03-31 11:25:46 -04:00
Martin Weinelt f5eed9579b
Merge pull request #117645 from zhaofengli/linux-srv6
linux: Enable SRv6 options
2021-03-29 05:00:08 +02:00
Tim Steinbach 6052a427a1 linux/hardened/patches/5.4: 5.4.107-hardened1 -> 5.4.108-hardened1 2021-03-26 18:50:13 -04:00
Tim Steinbach 036646460b linux/hardened/patches/5.11: 5.11.8-hardened1 -> 5.11.9-hardened1 2021-03-26 18:50:13 -04:00
Tim Steinbach 98d48280b7 linux/hardened/patches/4.19: 4.19.182-hardened1 -> 4.19.183-hardened1 2021-03-26 18:50:13 -04:00
Tim Steinbach 435366bdd3 linux/hardened/patches/4.14: 4.14.226-hardened1 -> 4.14.227-hardened1 2021-03-26 18:50:13 -04:00
Tim Steinbach 6765e61ed4 linux: 5.10.25 -> 5.10.26 2021-03-26 18:50:13 -04:00
Tim Steinbach 1c7273cc17 linux: 5.4.107 -> 5.4.108 2021-03-26 18:50:13 -04:00
Tim Steinbach 9ce0fb815c linux: 5.11.8 -> 5.11.9 2021-03-26 18:50:13 -04:00
Tim Steinbach 57ea233d16 linux: 4.9.262 -> 4.9.263 2021-03-26 18:50:13 -04:00
Tim Steinbach c9dcff241e linux: 4.4.262 -> 4.4.263 2021-03-26 18:50:13 -04:00
Tim Steinbach dcd01727b4 linux: 4.19.182 -> 4.19.183 2021-03-26 18:50:13 -04:00
Tim Steinbach a17346234a linux: 4.14.226 -> 4.14.227 2021-03-26 18:50:13 -04:00
Tim Steinbach bd2bb9e381 linux-hardened: Enable KFENCE
"Kernel Electric-Fence (KFENCE) is a low-overhead sampling-based memory safety
error detector. KFENCE detects heap out-of-bounds access, use-after-free, and
invalid-free errors."
2021-03-26 18:48:37 -04:00
Tim Steinbach a7d6642cf3 linux-testing: 5.11-rc5 -> 5.12-rc4
- Sound SOC support was refactored in
torvalds/linux@43df5242af

- GMA3600 is part of GMA500 as of
torvalds/linux@26499e0518
2021-03-26 18:48:37 -04:00
Zhaofeng Li 6981b50e9d linux: Enable SRv6 options 2021-03-26 10:54:12 -07:00
Tim Steinbach 09406084bd linux-hardened: Fix page poisoning for 5.11
`PAGE_POISONING_NO_SANITY` was removed in
https://git.kernel.org/linus/8f424750baaafcef229791882e879da01c9473b5

`PAGE_POISONING_ZERO` was removed in
https://git.kernel.org/linus/f289041ed4cf9a3f6e8a32068fef9ffb2acc5662
2021-03-24 09:19:44 -04:00
Timo Kaufmann e2740dbc69
Merge pull request #117107 from Atemu/update/zen-kernels
zen-kernels: 5.11.5 -> 5.11.8
2021-03-23 14:05:12 +00:00
Tim Steinbach e31c3509c5 linux/hardened/patches/5.4: 5.4.106-hardened1 -> 5.4.107-hardened1 2021-03-23 09:19:18 -04:00
Tim Steinbach b8ebd38d64 linux/hardened/patches/5.11: 5.11.7-hardened1 -> 5.11.8-hardened1 2021-03-23 09:19:18 -04:00
Tim Steinbach c57b8eb8fe linux/hardened/patches/5.10: 5.10.24-hardened1 -> 5.10.25-hardened1 2021-03-23 09:19:18 -04:00
Tim Steinbach c1fb1f8ef7 linux/hardened/patches/4.19: 4.19.181-hardened1 -> 4.19.182-hardened1 2021-03-23 09:19:18 -04:00
Tim Steinbach 6b71132fcf linux-rt_5_4: 5.4.102-rt53 -> 5.4.106-rt54 2021-03-23 09:19:18 -04:00
Tim Steinbach 1e72305d0f linux: 5.4.106 -> 5.4.107 2021-03-23 09:19:18 -04:00
Tim Steinbach 3a1c01b3fe linux: 5.11.7 -> 5.11.8 2021-03-23 09:19:18 -04:00
Tim Steinbach 6283fc9d51 linux: 5.10.24 -> 5.10.25 2021-03-23 09:19:18 -04:00
Tim Steinbach 583c99ef13 linux: 4.19.181 -> 4.19.182 2021-03-23 09:19:18 -04:00
Atemu b8d9d14be4 zen-kernels: 5.11.5 -> 5.11.8 2021-03-21 09:19:17 +01:00
Atemu efb1815d1b
zen-kernels: 5.11.1 -> 5.11.5 (#115920) 2021-03-21 00:50:02 +01:00
Tim Steinbach fcab19deb7 linux/hardened/patches/5.4: 5.4.105-hardened1 -> 5.4.106-hardened1 2021-03-18 12:25:26 -04:00
Tim Steinbach ed933906b5 linux/hardened/patches/5.11: 5.11.6-hardened1 -> 5.11.7-hardened1 2021-03-18 12:25:26 -04:00
Tim Steinbach d013e2e97b linux/hardened/patches/5.10: 5.10.23-hardened1 -> 5.10.24-hardened1 2021-03-18 12:25:26 -04:00
Tim Steinbach 89de81439d linux/hardened/patches/4.19: 4.19.180-hardened1 -> 4.19.181-hardened1 2021-03-18 12:25:26 -04:00