Commit Graph

10397 Commits

Author SHA1 Message Date
TredwellGit
19735ff280 linux: 4.9.287 -> 4.9.288 2021-10-27 09:52:29 +00:00
TredwellGit
3a69f006d9 linux: 4.4.289 -> 4.4.290 2021-10-27 09:52:24 +00:00
TredwellGit
b7efb90537 linux: 4.19.213 -> 4.19.214 2021-10-27 09:52:20 +00:00
TredwellGit
20e62a2b01 linux: 4.14.252 -> 4.14.253 2021-10-27 09:52:14 +00:00
github-actions[bot]
f9ab4de694 Merge staging-next into staging 2021-10-22 18:01:54 +00:00
Jonathan Ringer
fc25d94010 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/jupyter-client/default.nix
	pkgs/development/python-modules/jupyterlab-git/default.nix
2021-10-22 09:33:07 -07:00
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