Commit Graph

5506 Commits

Author SHA1 Message Date
github-actions[bot]
10263fd59e
Merge master into staging-next 2021-12-26 00:01:55 +00:00
Dmitry Kalinkin
2ddda43924
Merge branch 'staging' into staging-next
Conflicts:
	pkgs/os-specific/linux/kernel/common-config.nix
2021-12-25 17:16:26 -05:00
fortuneteller2k
de06c5e8e8 linux_xanmod: remove duplicate android kernel options
and enable WINESYNC in kernel config
2021-12-26 04:58:32 +08:00
Jörg Thalheim
276bd41027
Merge pull request #151733 from Mic92/zen
linux_zen: 5.15.8-zen1 -> 5.15.11-zen1
2021-12-25 17:49:18 +00:00
github-actions[bot]
15494ec8f1
Merge master into staging-next 2021-12-25 12:01:18 +00:00
Maximilian Bosch
d471a92e8d
Merge pull request #151792 from TredwellGit/linux
Kernels 2021-12-22
2021-12-25 11:06:07 +01:00
github-actions[bot]
b7f2d2da61
Merge master into staging-next 2021-12-24 00:01:44 +00:00
Linus Heckemann
e998439b18
Merge pull request #151140 from lheckemann/fsl_uapi
linux: enable FSL_MC_UAPI_SUPPORT
2021-12-24 00:33:46 +01:00
Dmitry Kalinkin
1a9297102c
Merge branch 'master' into staging-next 2021-12-23 16:58:33 -05:00
Bernardo Meurer
0aec77573b
linux_xanmod: 5.15.7 -> 5.15.11 2021-12-23 17:44:59 -03:00
TredwellGit
387250dce5 linux_latest-libre: 18484 -> 18517 2021-12-22 17:18:23 +00:00
TredwellGit
0cb00d51f7 linux-rt_5_10: 5.10.83-rt58 -> 5.10.87-rt59 2021-12-22 17:18:04 +00:00
TredwellGit
fbd944d91d linux: 5.4.167 -> 5.4.168 2021-12-22 17:09:52 +00:00
TredwellGit
fa7b495239 linux: 5.15.10 -> 5.15.11 2021-12-22 17:09:45 +00:00
TredwellGit
9b43bf552f linux: 5.10.87 -> 5.10.88 2021-12-22 17:09:37 +00:00
TredwellGit
2ccbef604f linux: 4.9.293 -> 4.9.294 2021-12-22 17:09:31 +00:00
TredwellGit
11486e8377 linux: 4.4.295 -> 4.4.296 2021-12-22 17:09:20 +00:00
TredwellGit
545cffb0b5 linux: 4.19.221 -> 4.19.222 2021-12-22 17:09:14 +00:00
TredwellGit
b375970256 linux: 4.14.258 -> 4.14.259 2021-12-22 17:09:08 +00:00
Jörg Thalheim
c5e9cacf97 linux_zen: 5.15.8-zen1 -> 5.15.11-zen1 2021-12-22 11:41:10 +01:00
Dmitry Kalinkin
0cf94e8de4
Merge branch 'staging-next' into staging 2021-12-18 10:19:31 -05:00
Dmitry Kalinkin
da8f155b2a
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/sphinxext-opengraph/default.nix
2021-12-18 10:18:14 -05:00
TredwellGit
8d4c056723 linux/hardened/patches/5.4: 5.4.164-hardened1 -> 5.4.167-hardened1 2021-12-17 23:09:47 +00:00
TredwellGit
f51d19746a linux/hardened/patches/5.15: 5.15.7-hardened1 -> 5.15.10-hardened1 2021-12-17 23:09:39 +00:00
TredwellGit
a900de3567 linux/hardened/patches/5.10: 5.10.84-hardened1 -> 5.10.87-hardened1 2021-12-17 23:09:32 +00:00
TredwellGit
8e317ff982 linux/hardened/patches/4.19: 4.19.220-hardened1 -> 4.19.221-hardened1 2021-12-17 23:09:25 +00:00
TredwellGit
d9fdc409d1 linux/hardened/patches/4.14: 4.14.257-hardened1 -> 4.14.258-hardened1 2021-12-17 23:09:18 +00:00
TredwellGit
a1470e23da linux: 5.4.164 -> 5.4.167 2021-12-17 23:08:29 +00:00
TredwellGit
8955b58c5e linux: 5.15.7 -> 5.15.10 2021-12-17 23:08:22 +00:00
TredwellGit
72b54385a5 linux: 5.10.84 -> 5.10.87 2021-12-17 23:08:15 +00:00
TredwellGit
837103a484 linux: 4.9.292 -> 4.9.293 2021-12-17 23:08:08 +00:00
TredwellGit
2deb4377d5 linux: 4.4.294 -> 4.4.295 2021-12-17 23:08:02 +00:00
TredwellGit
9eacb2bb44 linux: 4.19.220 -> 4.19.221 2021-12-17 23:07:56 +00:00
TredwellGit
860b4c92b8 linux: 4.14.257 -> 4.14.258 2021-12-17 23:07:50 +00:00
Linus Heckemann
588db2a720 linux: enable FSL_MC_UAPI_SUPPORT 2021-12-18 00:05:49 +01:00
Alyssa Ross
e07182012b
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/pint/default.nix
2021-12-17 05:50:06 +00:00
Dmitry Kalinkin
889227a048
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
Jörg Thalheim
6942ed7b84 linux_zen: 5.15.6-zen2 -> 5.15.8-zen1 2021-12-16 12:52:56 +01:00
Dmitry Kalinkin
07a8ae0c5a
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/libraries/log4cplus/default.nix
2021-12-11 14:01:19 -05:00
github-actions[bot]
0f2bb5a63f
Merge master into staging-next 2021-12-10 12:01:12 +00:00
Jörg Thalheim
6cf571148b
Merge pull request #148399 from Mic92/zen
linux_zen: 5.15.5-zen1 -> 5.15.6-zen2
2021-12-10 06:30:57 +00:00
github-actions[bot]
35a3e58b28
Merge master into staging-next 2021-12-09 12:01:25 +00:00
Bernardo Meurer
05246dc445
Merge pull request #149620 from TredwellGit/linux
Kernels 2021-12-08
2021-12-09 03:04:29 -08:00
TredwellGit
dc7d9307ae linux/hardened/patches/5.4: 5.4.163-hardened1 -> 5.4.164-hardened1 2021-12-09 06:49:29 +00:00
TredwellGit
935a3eb77b linux/hardened/patches/5.15: 5.15.6-hardened1 -> 5.15.7-hardened1 2021-12-09 06:49:21 +00:00
TredwellGit
4e28ad8780 linux/hardened/patches/5.10: 5.10.83-hardened1 -> 5.10.84-hardened1 2021-12-09 06:49:12 +00:00
TredwellGit
ac0487fe56 linux/hardened/patches/4.19: 4.19.219-hardened1 -> 4.19.220-hardened1 2021-12-09 06:49:04 +00:00
TredwellGit
8448ac947f linux/hardened/patches/4.14: 4.14.256-hardened1 -> 4.14.257-hardened1 2021-12-09 06:48:56 +00:00
TredwellGit
7f32450344 linux-rt_5_4: 5.4.161-rt66 -> 5.4.161-rt67 2021-12-09 06:48:22 +00:00
TredwellGit
7952853749 linux-rt_5_10: 5.10.78-rt56 -> 5.10.83-rt58 2021-12-09 06:38:55 +00:00