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