Commit Graph

5391 Commits

Author SHA1 Message Date
Sandro
367536a15c
Merge pull request #142511 from arcnmx/linux515rc 2021-10-22 15:13:09 +02:00
arcnmx
146c830cff linux_testing: 5.13-rc6 -> 5.15-rc6 2021-10-21 12:29:09 -07:00
Sandro
c52f72d97d
Merge pull request #142489 from lovesegfault/linux_xanmod-5.14.14-2 2021-10-21 20:23:03 +02:00
Samuel Dionne-Riel
16a55a22a5
Merge pull request #142015 from jkarlson/simplefb
linux: FB_SIMPLE
2021-10-21 13:47:49 -04:00
Bernardo Meurer
617d94d7da
linuxKernel.kernels.linux_xanmod: 5.14.14-1 -> 5.14.14-2 2021-10-21 10:20:05 -07:00
Michael Adler
f7297104ec linux_zen: 5.14.8-zen1 -> 5.14.14-zen1 2021-10-21 08:39:55 +02:00
Michael Adler
43b4591bbd linux_lqx: 5.14.11 -> 5.14.14 2021-10-21 08:36:26 +02:00
github-actions[bot]
79a336f4e0
Merge staging-next into staging 2021-10-21 06:01:58 +00:00
github-actions[bot]
54a42ab846
Merge master into staging-next 2021-10-21 06:01:21 +00:00
Jörg Thalheim
3897b34444
Merge pull request #142399 from Mic92/bcache-revert
Revert "linux_testing_bcachefs: upstream tarballs rather patchsets"
2021-10-21 06:59:10 +01:00
Bernardo Meurer
0530b5e15f
linuxKernel.kernels.linux_xanmod: 5.14.12 -> 5.14.14 2021-10-20 17:57:23 -07:00
github-actions[bot]
fb42f8d317
Merge staging-next into staging 2021-10-21 00:02:26 +00:00
github-actions[bot]
872437b0f0
Merge master into staging-next 2021-10-21 00:01:47 +00:00
Maximilian Bosch
bb5aa0109b
linux: build hardened kernel with matching releases
Until now we merged kernel updates even if no hardened versions were
available yet. On one hand we don't want to delay patch-level updates,
on the other hand users of hardened kernels have frequent breakage now[1].

This change aims to provide a solution this issue:

* The hardened patchset now references the kernel version it's released
  for (including a sha256 hash for the fixed-output path of the source
  tarball).
* The `hardenedKernelFor`-function doesn't just append hardened patches
  now, but also overrides version & src to match the kernel version the
  patch was built & tested for.

Refs #140281

[1] https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.linuxPackages_hardened.kernel.x86_64-linux/all
2021-10-20 23:51:52 +02:00
Maximilian Bosch
65930caffe
linux: create maintainer team
Now there are a few more folks who should get pinged on kernel changes:

    $ nix-instantiate -E 'with import ./. {}; (map (x: x.github) linux.meta.maintainers)' --eval  --strict
    [ "TredwellGit" "mweinelt" "ma27" "nequissimus" "alyssais" "thoughtpolice" ]

Refs #140281
2021-10-20 23:49:33 +02:00
Jörg Thalheim
161d1b7f6e Revert "linux_testing_bcachefs: upstream tarballs rather patchsets"
This reverts commit 98ae18fa62.

Appearantly the consens is that a broken kernel is preferred over a
working one that is based on an outdated kernel:

98ae18fa62
2021-10-20 21:05:36 +02:00
TredwellGit
75dbbe37be linux/hardened/patches/5.4: 5.4.152-hardened1 -> 5.4.154-hardened1 2021-10-20 11:40:40 +00:00
TredwellGit
cf9f5f74dd linux/hardened/patches/5.14: 5.14.11-hardened1 -> 5.14.13-hardened1 2021-10-20 11:40:39 +00:00
TredwellGit
e94db0f89c linux/hardened/patches/5.10: 5.10.72-hardened1 -> 5.10.74-hardened1 2021-10-20 11:40:38 +00:00
TredwellGit
a33fc5384b linux/hardened/patches/4.19: 4.19.210-hardened1 -> 4.19.212-hardened1 2021-10-20 11:40:37 +00:00
TredwellGit
cf0d47c505 linux/hardened/patches/4.14: 4.14.250-hardened1 -> 4.14.251-hardened1 2021-10-20 11:40:36 +00:00
TredwellGit
25ef63bb78 linux: 5.4.154 -> 5.4.155 2021-10-20 11:40:01 +00:00
TredwellGit
a96f1a866a linux: 5.14.13 -> 5.14.14 2021-10-20 11:39:55 +00:00
TredwellGit
a3edfb9ee5 linux: 5.10.74 -> 5.10.75 2021-10-20 11:39:50 +00:00
TredwellGit
e4f4df78fa linux: 4.19.212 -> 4.19.213 2021-10-20 11:39:33 +00:00
TredwellGit
c4d7df2b7b linux: 4.14.251 -> 4.14.252 2021-10-20 11:39:09 +00:00
Emil Karlson
2ef28fb77d linux: do not build in DRM_SIMPLEDRM on newer kernels
After linux 5.14.11 FB_SIMPLE conflicts with DRM_SIMPLEDRM, which
will fail configuration, when DRM_SIMPLEDRM is configured as a module
and FB_SIMPLE gets requested as builtin.

Do not enable DRM_SIMPLEDRM as a temporary workaround, until good
enough migration path is found.
2021-10-20 13:11:28 +03:00
github-actions[bot]
2564b3d967
Merge staging-next into staging 2021-10-19 18:01:48 +00:00
Vladimír Čunát
01df3cd7dd
Merge branch 'master' into staging-next 2021-10-19 19:24:43 +02:00
Fabián Heredia Montiel
8b9b630e10 linux-rt_5_10: 5.10.65-rt53 -> 5.10.73-rt54 2021-10-17 09:27:46 -05:00
Fabián Heredia Montiel
664c8144e4 linux: 5.4.153 -> 5.4.154 2021-10-17 09:27:39 -05:00
Fabián Heredia Montiel
a69ff911a3 linux: 5.14.12 -> 5.14.13 2021-10-17 09:27:35 -05:00
Fabián Heredia Montiel
6b68a5efc1 linux: 5.10.73 -> 5.10.74 2021-10-17 09:27:33 -05:00
Fabián Heredia Montiel
dc4916976e linux: 4.9.286 -> 4.9.287 2021-10-17 09:27:29 -05:00
Fabián Heredia Montiel
e2efd3de26 linux: 4.4.288 -> 4.4.289 2021-10-17 09:27:27 -05:00
Fabián Heredia Montiel
5275780c12 linux: 4.19.211 -> 4.19.212 2021-10-17 09:27:26 -05:00
Fabián Heredia Montiel
62cd542b26 linux: 4.14.250 -> 4.14.251 2021-10-17 09:27:22 -05:00
github-actions[bot]
c443efc2b2
Merge staging-next into staging 2021-10-17 00:01:56 +00:00
Ryan Burns
3220fbe696 Merge branch 'master' into staging-next 2021-10-16 16:07:38 -07:00
Maximilian Bosch
e02259066f
Merge pull request #141499 from TredwellGit/linux
Kernels 2021-10-13
2021-10-16 20:39:25 +02:00
Samuel Dionne-Riel
8591a11495
Merge pull request #140587 from jkarlson/efiloader
kernel: enable EFI initrd loader
2021-10-15 22:02:59 -04:00
Maximilian Bosch
a8498f08bf
linux-libre: unbreak 2021-10-16 02:39:33 +02:00
Martin Weinelt
adf4e67dd4 Merge remote-tracking branch 'origin/staging' into staging-next 2021-10-15 01:34:36 +02:00
Linus Heckemann
dd5f07afca
linux: build dtbs in parallel (#106846)
linux: build DTBs in buildPhase, install with everything else

This improves build speed, especially on machines with lots of cores
such as the aarch64 community box and hydra builders.
2021-10-14 19:41:32 +02:00
Bernardo Meurer
51f32e34ab
linuxKernel.kernels.linux_xanmod: 5.14.9 -> 5.14.12 2021-10-14 00:51:30 -07:00
TredwellGit
08d4bb6e7a linux: 5.4.152 -> 5.4.153 2021-10-13 13:06:12 +00:00
TredwellGit
39189bc4f0 linux: 5.14.11 -> 5.14.12 2021-10-13 13:06:07 +00:00
TredwellGit
4f59512c0c linux: 5.10.72 -> 5.10.73 2021-10-13 13:06:00 +00:00
TredwellGit
821d8339f8 linux: 4.19.210 -> 4.19.211 2021-10-13 13:05:53 +00:00
github-actions[bot]
e69f5a133f
Merge staging-next into staging 2021-10-13 00:02:00 +00:00
Sandro
bd2a288ea5
Merge pull request #141295 from trofi/fix-perf-annotate 2021-10-12 21:49:20 +02:00
github-actions[bot]
7af387291c
Merge staging-next into staging 2021-10-12 12:02:08 +00:00
TredwellGit
c7b05f54df linux/hardened/patches/5.4: 5.4.150-hardened1 -> 5.4.152-hardened1 2021-10-12 07:37:16 -04:00
TredwellGit
331bb5fcec linux/hardened/patches/5.14: 5.14.9-hardened1 -> 5.14.11-hardened1 2021-10-12 07:37:16 -04:00
TredwellGit
42dd28857d linux/hardened/patches/5.10: 5.10.70-hardened1 -> 5.10.72-hardened1 2021-10-12 07:37:16 -04:00
TredwellGit
8df94e6d31 linux/hardened/patches/4.19: 4.19.208-hardened1 -> 4.19.210-hardened1 2021-10-12 07:37:16 -04:00
TredwellGit
6e94404dc3 linux/hardened/patches/4.14: 4.14.248-hardened1 -> 4.14.250-hardened1 2021-10-12 07:37:16 -04:00
TredwellGit
86589e8cd3 linux_latest-libre: 18314 -> 18380 2021-10-12 07:37:16 -04:00
TredwellGit
1d14ebf414 linux: 5.4.151 -> 5.4.152 2021-10-12 07:37:16 -04:00
TredwellGit
e2be686e0a linux: 5.14.10 -> 5.14.11 2021-10-12 07:37:16 -04:00
TredwellGit
2363ead003 linux: 5.10.71 -> 5.10.72 2021-10-12 07:37:16 -04:00
TredwellGit
049968322b linux: 4.9.285 -> 4.9.286 2021-10-12 07:37:16 -04:00
TredwellGit
97f30440d9 linux: 4.4.287 -> 4.4.288 2021-10-12 07:37:16 -04:00
TredwellGit
4d1cd369c8 linux: 4.19.209 -> 4.19.210 2021-10-12 07:37:16 -04:00
TredwellGit
ac66a2835c linux: 4.14.249 -> 4.14.250 2021-10-12 07:37:16 -04:00
github-actions[bot]
5065827878
Merge staging-next into staging 2021-10-12 00:02:05 +00:00
Sergei Trofimovich
a3270eb062 linuxPackages.perf: fix objdump lookup
By default 'perf annotate' runs "objdump" from PATH.
Unfortunately ${binutils}/bin/ dos not provide it as
it's a minimal wrapper for gcc.

${binutils-unwrapped}/bin/ does have full set of tools.
Let's use that instead.
2021-10-11 23:07:19 +01:00
Sandro
0063bed192
Merge pull request #141267 from Atemu/update/linux_lqx 2021-10-11 21:21:12 +02:00
Atemu
895d09aa3a linux_lqx: 5.14.9 -> 5.14.11 2021-10-11 18:27:24 +02:00
github-actions[bot]
1b2b1c3d56
Merge staging-next into staging 2021-10-10 00:02:14 +00:00
Ben Wolsieffer
a6c34ff363 linux: cleanup zlib conditional dependency
zlib was added to its own optional statement, when there was already another for
5.2
2021-10-08 20:09:58 -04:00
github-actions[bot]
b4569f7a81
Merge staging-next into staging 2021-10-08 00:02:10 +00:00
TredwellGit
d609f3d79b linux: 5.4.150 -> 5.4.151 2021-10-07 07:59:15 +00:00
TredwellGit
86eb5c0943 linux: 5.14.9 -> 5.14.10 2021-10-07 07:59:08 +00:00
TredwellGit
6a1f123725 linux: 5.10.70 -> 5.10.71 2021-10-07 07:59:00 +00:00
TredwellGit
e7e463220d linux: 4.9.284 -> 4.9.285 2021-10-07 07:58:53 +00:00
TredwellGit
1dfb79c887 linux: 4.4.285 -> 4.4.287 2021-10-07 07:58:48 +00:00
TredwellGit
098ad9636c linux: 4.19.208 -> 4.19.209 2021-10-07 07:58:42 +00:00
TredwellGit
8d2f3a9fb1 linux: 4.14.248 -> 4.14.249 2021-10-07 07:58:36 +00:00
github-actions[bot]
ae9f8ec1b6
Merge staging-next into staging 2021-10-07 00:02:11 +00:00
Robin Townsend
a961352f5e linux-testing-bcachefs: Add note about keeping bcachefs-tools up to date 2021-10-06 18:29:49 -04:00
Sandro
cdf359773c
Merge pull request #140796 from IvarWithoutBones/fix/linux-libre 2021-10-07 00:01:04 +02:00
IvarWithoutBones
8840f68cd4 linux-libre: fix build and unmark as broken 2021-10-06 02:54:33 +02:00
Sandro
f5dacea100
Merge pull request #140660 from Atemu/update/linux_lqx 2021-10-05 23:16:16 +02:00
Emil Karlson
6b7671d4ae kernel: enable EFI initrd loader
Initrd loader is not enabled by default in some aarch64 kernels,
which makes systemd-boot booted kernels fail by default, add this
everywhere, since this is a sane default even when it's already in
some kernel defaults.
2021-10-05 12:28:47 +03:00
Atemu
8dc03d0606 linux_lqx: 5.14.6 -> 5.14.9 2021-10-04 10:35:26 +02:00
github-actions[bot]
db9657cccd
Merge master into staging-next 2021-10-03 12:01:21 +00:00
Jörg Thalheim
98ae18fa62 linux_testing_bcachefs: upstream tarballs rather patchsets
This reverts commit cb1b1cf9c6.

bcachefs lacks behind kernel mainline, so we need to use upstream
commits rather than patchsets.
2021-10-03 08:11:00 +02:00
github-actions[bot]
90a3ecee8f
Merge master into staging-next 2021-10-02 00:04:43 +00:00
Bernardo Meurer
f9b21f68ed
Merge pull request #140092 from lovesegfault/linux_xanmod-5.14.9
linuxKernel.kernels.linux_xanmod: 5.14.8 -> 5.14.9
2021-10-01 20:05:01 +00:00
TredwellGit
642ca73937 linux/hardened/patches/5.4: 5.4.149-hardened1 -> 5.4.150-hardened1 2021-10-01 04:17:10 +00:00
TredwellGit
dd93aec4c4 linux/hardened/patches/5.14: 5.14.8-hardened1 -> 5.14.9-hardened1 2021-10-01 04:17:09 +00:00
TredwellGit
f178ff4a04 linux/hardened/patches/5.10: 5.10.69-hardened1 -> 5.10.70-hardened1 2021-10-01 04:17:08 +00:00
TredwellGit
6937daff0d linux: 5.4.149 -> 5.4.150 2021-10-01 04:16:32 +00:00
TredwellGit
b540e8b5a9 linux: 5.14.8 -> 5.14.9 2021-10-01 04:16:26 +00:00
TredwellGit
8417ed79d8 linux: 5.10.69 -> 5.10.70 2021-10-01 04:16:18 +00:00
Bernardo Meurer
3f012da95b
linuxKernel.kernels.linux_xanmod: 5.14.8 -> 5.14.9 2021-09-30 15:26:23 -07:00
github-actions[bot]
19e8f1b28f
Merge master into staging-next 2021-09-29 18:01:07 +00:00
Jörg Thalheim
1d8a2cd066
Merge pull request #138525 from Mic92/zen
linux_zen: 5.14.3-zen1 -> 5.14.8-zen1
2021-09-29 14:57:53 +01:00
github-actions[bot]
2779e3a8fc
Merge master into staging-next 2021-09-29 12:01:04 +00:00
Maximilian Bosch
7d890267d1
Merge pull request #139665 from Ma27/drop-linux-5.13
linux_5_13: drop
2021-09-29 13:10:10 +02:00
github-actions[bot]
5f4614a24e
Merge master into staging-next 2021-09-28 12:01:17 +00:00
Jörg Thalheim
797e62abfc linux_zen: 5.14.3-zen1 -> 5.14.8-zen1 2021-09-28 13:09:37 +02:00
Jörg Thalheim
c21ba4f7bb linux: fix cross-build dependencies
This is untested but according to
https://github.com/NixOS/nixpkgs/pull/127922#issuecomment-927346171

zlib is only used in the host build, which breaks cross-compilation if
not present.
2021-09-28 09:21:23 +00:00
github-actions[bot]
2be25e103b
Merge master into staging-next 2021-09-28 00:01:31 +00:00
Maximilian Bosch
01eb8ec98a
linux_5_13: drop
5.13.19 was the last 5.13 release and the version is now EOL[1].

[1] https://lwn.net/Articles/869747/
2021-09-27 23:29:53 +02:00
TredwellGit
a92a208a9d linux/hardened/patches/5.4: 5.4.148-hardened1 -> 5.4.149-hardened1 2021-09-27 20:00:41 +00:00
TredwellGit
05ed561fb6 linux/hardened/patches/5.14: 5.14.7-hardened1 -> 5.14.8-hardened1 2021-09-27 20:00:40 +00:00
TredwellGit
c4ea02fc5c linux/hardened/patches/5.10: 5.10.68-hardened1 -> 5.10.69-hardened1 2021-09-27 20:00:39 +00:00
TredwellGit
9e78068b04 linux/hardened/patches/4.19: 4.19.207-hardened1 -> 4.19.208-hardened1 2021-09-27 20:00:38 +00:00
TredwellGit
1e05c4eae9 linux/hardened/patches/4.14: 4.14.247-hardened1 -> 4.14.248-hardened1 2021-09-27 20:00:37 +00:00
github-actions[bot]
7bb1bfbf29
Merge master into staging-next 2021-09-27 06:01:12 +00:00
Bernardo Meurer
8b78e1c821
Merge pull request #139551 from TredwellGit/linux 2021-09-27 02:40:07 +00:00
github-actions[bot]
3bc444ba47
Merge master into staging-next 2021-09-27 00:01:23 +00:00
Bernardo Meurer
a3fa65e48f
linuxKernel.kernels.linux_xanmod: 5.14.7 -> 5.14.8 2021-09-26 14:27:09 -07:00
TredwellGit
bb21f231cf linux/hardened/patches/5.4: 5.4.147-hardened1 -> 5.4.148-hardened1 2021-09-26 17:03:30 +00:00
TredwellGit
5b71d92f9a linux/hardened/patches/5.14: 5.14.6-hardened1 -> 5.14.7-hardened1 2021-09-26 17:03:29 +00:00
TredwellGit
34fe5d827c linux/hardened/patches/5.10: 5.10.67-hardened1 -> 5.10.68-hardened1 2021-09-26 17:03:28 +00:00
TredwellGit
b754a3c355 linux/hardened/patches/4.19: 4.19.206-hardened1 -> 4.19.207-hardened1 2021-09-26 17:03:27 +00:00
TredwellGit
7b29a72e54 linux/hardened/patches/4.14: 4.14.246-hardened1 -> 4.14.247-hardened1 2021-09-26 17:03:26 +00:00
TredwellGit
fa3a710526 linux: 5.4.148 -> 5.4.149 2021-09-26 17:02:51 +00:00
TredwellGit
10fee833c9 linux: 5.14.7 -> 5.14.8 2021-09-26 17:02:44 +00:00
TredwellGit
bba95d3763 linux: 5.10.68 -> 5.10.69 2021-09-26 17:02:36 +00:00
TredwellGit
bb9a54d5ee linux: 4.9.283 -> 4.9.284 2021-09-26 17:02:30 +00:00
TredwellGit
bae26c4e05 linux: 4.4.284 -> 4.4.285 2021-09-26 17:02:23 +00:00
TredwellGit
7fad98993c linux: 4.19.207 -> 4.19.208 2021-09-26 17:02:19 +00:00
TredwellGit
b0f3a99f00 linux: 4.14.247 -> 4.14.248 2021-09-26 17:02:15 +00:00
github-actions[bot]
55c0ac1484
Merge staging-next into staging 2021-09-24 06:01:40 +00:00
Ryan Burns
40299257cc Merge branch 'master' into staging-next 2021-09-23 18:43:00 -07:00
Bernardo Meurer
0785430a5e
linuxKernel.kernels.linux_xanmod: 5.14.6 -> 5.14.7 2021-09-22 19:13:04 -07:00
github-actions[bot]
c836da689f
Merge staging-next into staging 2021-09-23 00:03:12 +00:00
Luke Granger-Brown
7002c15677 linuxKernel.kernels.linux_5_13_hardened: fix build
BTF cannot be enabled at the same time as the RANDSTRUCT GCC plugin, so
we need to mark it as optional. Alas.
2021-09-22 22:26:36 +00:00
github-actions[bot]
42ade1cfa3
Merge staging-next into staging 2021-09-22 18:01:40 +00:00
github-actions[bot]
09a7436fcc
Merge master into staging-next 2021-09-22 18:01:01 +00:00
TredwellGit
3cd2a4032b linux: 5.4.147 -> 5.4.148 2021-09-22 09:57:22 -04:00
TredwellGit
6e1498613f linux: 5.14.6 -> 5.14.7 2021-09-22 09:57:22 -04:00
TredwellGit
afc93c11bb linux: 5.10.67 -> 5.10.68 2021-09-22 09:57:22 -04:00
TredwellGit
217af32349 linux: 4.9.282 -> 4.9.283 2021-09-22 09:57:22 -04:00
TredwellGit
0931ea2be7 linux: 4.4.283 -> 4.4.284 2021-09-22 09:57:22 -04:00
TredwellGit
9eddcf0c15 linux: 4.19.206 -> 4.19.207 2021-09-22 09:57:22 -04:00
TredwellGit
1e54b5a2fc linux: 4.14.246 -> 4.14.247 2021-09-22 09:57:22 -04:00
github-actions[bot]
2505488672
Merge staging-next into staging 2021-09-22 12:02:01 +00:00
Alyssa Ross
b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
Bernardo Meurer
c4f9df268a
Merge pull request #138564 from lovesegfault/linux_xanmod-5.14.6 2021-09-22 04:02:28 +00:00
Sandro
f0955beaff
Merge pull request #107525 from xaverdh/kernel-manual-config-fix 2021-09-21 22:12:11 +02:00
Sandro
7ecc0a0181
Merge pull request #138632 from Atemu/update/linux_lqx 2021-09-21 21:07:08 +02:00
github-actions[bot]
fd3d37414d
Merge master into staging-next 2021-09-21 12:01:29 +00:00
Atemu
e4809b1143 linux_lqx: 5.13.15 -> 5.14.6 2021-09-21 09:10:01 +02:00
TredwellGit
b8b772a1da linux/hardened/patches/5.14: 5.14.5-hardened1 -> 5.14.6-hardened1 2021-09-20 21:41:39 +00:00
TredwellGit
a41022ed40 linux/hardened/patches/5.13: 5.13.18-hardened1 -> 5.13.19-hardened1 2021-09-20 21:41:38 +00:00