Commit graph

5008 commits

Author SHA1 Message Date
github-actions[bot]
599a736772
Merge staging-next into staging 2021-08-19 00:02:01 +00:00
Bernardo Meurer
f38c807c61
linux_xanmod: 5.13.11 -> 5.13.12 2021-08-18 13:41:14 -07:00
Jan Tojnar
e286e1cfa0 Merge branch 'staging-next' into staging
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
github-actions[bot]
8a131da1bc
Merge master into staging-next 2021-08-17 00:01:28 +00:00
Maximilian Bosch
6546f6a63a
Merge pull request #134307 from Ma27/versioned-hardened-kernel
linuxPackages: drop latest_hardened, introduce versioned attributes
2021-08-16 21:09:22 +02:00
Maximilian Bosch
099113751e
linuxPackages_4_14_hardened: fix eval
Not sure if this is the right thing to do, but apparently we want this
setting for <4.18, so we hard-code it for 4.14 via `mkForce` (previously
this has led to conflicting definitions which is why the hardened 4.14
kernel never seems to have evaluated properly).
2021-08-16 20:46:02 +02:00
Bernardo Meurer
575f35cf8c
linux_xanmod: 5.13.10 -> 5.13.11 2021-08-16 10:21:40 -07:00
github-actions[bot]
c30d1d56fe
Merge master into staging-next 2021-08-16 12:01:50 +00:00
Maximilian Bosch
e55554491d
Merge pull request #133587 from TredwellGit/linux_5_12
linux_5_12: remove
2021-08-16 11:08:42 +02:00
github-actions[bot]
e9080dd5e3
Merge staging-next into staging 2021-08-16 00:02:02 +00:00
github-actions[bot]
c73393b6c7
Merge master into staging-next 2021-08-16 00:01:22 +00:00
TredwellGit
f2e78916b9 linux: 5.13.10 -> 5.13.11 2021-08-15 13:36:22 +00:00
TredwellGit
9e9933a76b linux: 4.9.279 -> 4.9.280 2021-08-15 13:36:22 +00:00
TredwellGit
039764362b linux: 4.4.280 -> 4.4.281 2021-08-15 13:36:22 +00:00
Jan Tojnar
cdb1d29692 Merge branch 'staging-next' into staging 2021-08-14 14:43:16 +02:00
Jan Tojnar
0aa35561e7 Merge branch 'master' into staging-next 2021-08-14 12:53:07 +02:00
Bernardo Meurer
ebec5d0df1
linux_xanmod: 5.13.9 -> 5.13.10 2021-08-12 14:20:05 -07:00
TredwellGit
89a50ded98 linux-rt_5_4: 5.4.129-rt61 -> 5.4.138-rt62 2021-08-12 15:05:26 +00:00
TredwellGit
ff1408d8b0 linux: 5.13.9 -> 5.13.10 2021-08-12 15:05:26 +00:00
TredwellGit
20ed07939e linux: 4.4.279 -> 4.4.280 2021-08-12 15:05:26 +00:00
TredwellGit
957f0485da linux_5_12: remove
https://lwn.net/ml/linux-kernel/1626791065147152@kroah.com/
2021-08-12 05:30:46 +00:00
Jan Tojnar
807d3ec359 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/misc/t1utils/default.nix
2021-08-11 16:34:11 +02:00
Jan Tojnar
4e7e464ae8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/tools/system/sg3_utils/default.nix
2021-08-11 16:22:42 +02:00
fortuneteller2k
a5ad9365a1 linux_xanmod: enable futex/futex2 2021-08-12 04:49:41 +08:00
Sandro
4ae944bb0a
Merge pull request #133286 from rvolosatovs/update/linux_zen
linux_zen: 5.13.7 -> 5.13.9
2021-08-11 13:14:47 +02:00
Sandro
773426cc24
Merge pull request #133405 from Atemu/update/linux_lqx
linux_lqx: 5.12.19 -> 5.13.9
2021-08-10 23:57:30 +02:00
Atemu
2aaf41173d linux_lqx: 5.12.19 -> 5.13.9 2021-08-10 20:37:56 +02:00
Roman Volosatovs
a9bf9c44e5
linux_zen: 5.13.7 -> 5.13.9 2021-08-09 21:31:40 +02:00
Martin Weinelt
5f746317f1
Merge pull request #133200 from TredwellGit/linux 2021-08-09 04:48:38 +02:00
TredwellGit
cbb5ca89ca linux/hardened/patches/5.4: 5.4.134-hardened1 -> 5.4.139-hardened1 2021-08-08 23:19:19 +00:00
TredwellGit
7aae6061b6 linux/hardened/patches/5.10: 5.10.52-hardened1 -> 5.10.57-hardened1 2021-08-08 23:19:18 +00:00
TredwellGit
0a41183454 linux/hardened/patches/4.19: 4.19.198-hardened1 -> 4.19.202-hardened1 2021-08-08 23:19:17 +00:00
TredwellGit
b84eecf9fc linux/hardened/patches/4.14: 4.14.240-hardened1 -> 4.14.243-hardened1 2021-08-08 23:19:16 +00:00
TredwellGit
8425e47a74 linux-rt_5_10: 5.10.52-rt47 -> 5.10.56-rt48 2021-08-08 23:18:42 +00:00
TredwellGit
b570def284 linux: 5.4.134 -> 5.4.139 2021-08-08 23:18:07 +00:00
TredwellGit
d416101b65 linux: 5.13.8 -> 5.13.9 2021-08-08 23:18:00 +00:00
TredwellGit
cde6046992 linux: 5.10.52 -> 5.10.57 2021-08-08 23:17:53 +00:00
TredwellGit
a5713826c4 linux: 4.9.278 -> 4.9.279 2021-08-08 23:17:45 +00:00
TredwellGit
1adb289851 linux: 4.4.278 -> 4.4.279 2021-08-08 23:17:40 +00:00
TredwellGit
553c6ef12a linux: 4.19.198 -> 4.19.202 2021-08-08 23:17:36 +00:00
TredwellGit
26ec7c39bb linux: 4.14.240 -> 4.14.243 2021-08-08 23:17:24 +00:00
Bernardo Meurer
090a158874
linux_xanmod: 5.13.8 -> 5.13.9 2021-08-08 14:44:08 -07:00
github-actions[bot]
c47bdfa71a
Merge staging-next into staging 2021-08-08 06:01:51 +00:00
github-actions[bot]
825ed68c05
Merge master into staging-next 2021-08-08 06:01:18 +00:00
Bernardo Meurer
1eb713de57
linux_xanmod: 5.13.7 -> 5.13.8 2021-08-07 19:13:42 -07:00
Bernardo Meurer
44ac8719ed
linux_xanmod: add lovesegfault to maintainers 2021-08-07 19:01:10 -07:00
github-actions[bot]
ee9898d7a3
Merge staging-next into staging 2021-08-07 00:01:59 +00:00
github-actions[bot]
d9e597f9bc
Merge master into staging-next 2021-08-07 00:01:27 +00:00
Bernardo Meurer
c181d9965c
linux_rpi{0,1,2,3,4}: 1.20210727 -> 1.20210805 2021-08-06 10:41:10 -07:00
Vladimír Čunát
8ab6ba6b1c
Merge branch 'staging-next' into staging 2021-08-06 09:14:57 +02:00