Commit Graph

10397 Commits

Author SHA1 Message Date
github-actions[bot]
2eac3106df Merge staging-next into staging 2022-03-17 00:02:45 +00:00
TredwellGit
39e2856eb6 linux_latest-libre: 18627 -> 18635 2022-03-16 16:46:45 +00:00
TredwellGit
ae3bcac97a linux: 5.4.184 -> 5.4.185 2022-03-16 16:46:26 +00:00
TredwellGit
79699f61a2 linux: 5.16.14 -> 5.16.15 2022-03-16 16:46:20 +00:00
TredwellGit
6ddf7b574c linux: 5.15.28 -> 5.15.29 2022-03-16 16:46:14 +00:00
TredwellGit
48b578d278 linux: 5.10.105 -> 5.10.106 2022-03-16 16:46:08 +00:00
TredwellGit
7ea40efa4d linux: 4.9.306 -> 4.9.307 2022-03-16 16:46:02 +00:00
TredwellGit
111be9fee3 linux: 4.19.234 -> 4.19.235 2022-03-16 16:45:56 +00:00
TredwellGit
19fe4b6872 linux: 4.14.271 -> 4.14.272 2022-03-16 16:45:50 +00:00
zowoq
6431086967 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Faye Duxovni
e1642afb01 kernel: common-config.nix: enable FANOTIFY_ACCESS_PERMISSIONS
Required for, eg, ClamAV's OnAccessPrevention feature.
2022-03-15 13:43:54 -04:00
Vladimír Čunát
f48c1fda6b Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments.  The fetched patch is already in src.
I checked that libvirt builds.
2022-03-15 09:52:04 +01:00
davidak
d2c95bb666 Merge pull request #163433 from JJJollyjim/bcachefs
bcachefs: unstable-2022-01-12 -> unstable-2022-03-09
2022-03-14 15:34:43 +01:00
Alyssa Ross
d7e181ff83 Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/compilers/ocaml/4.12.nix
	pkgs/development/python-modules/oci/default.nix
	pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
Jamie McClymont
3b01bd6249 bcachefs: update maintainers
As requested in https://github.com/NixOS/nixpkgs/pull/163433#issuecomment-1066169644
2022-03-14 21:52:18 +13:00
Jamie McClymont
4f64621056 linux_testing_bcachefs: unstable-2022-01-12 -> unstable-2022-03-09 2022-03-14 21:49:00 +13:00
github-actions[bot]
ea64a128d1 Merge master into staging-next 2022-03-14 00:02:12 +00:00
Guillaume Girol
446dda6d81 Merge pull request #159925 from NickCao/kmods
linuxPackages.*: various fixes related to cross compilation
2022-03-13 20:15:31 +00:00
github-actions[bot]
80180c339e Merge master into staging-next 2022-03-12 12:01:10 +00:00
TredwellGit
75db629894 linux_latest-libre: 18613 -> 18627 2022-03-12 07:21:25 +00:00
TredwellGit
4bf71faa06 linux-rt_5_4: 5.4.182-rt70 -> 5.4.182-rt71 2022-03-12 07:21:06 +00:00
TredwellGit
3d1e0b2e17 linux-rt_5_10: 5.10.100-rt62 -> 5.10.104-rt63 2022-03-12 07:20:35 +00:00
TredwellGit
c01eed31ba linux: 5.4.183 -> 5.4.184 2022-03-12 07:19:57 +00:00
TredwellGit
51d907345a linux: 5.16.13 -> 5.16.14 2022-03-12 07:19:50 +00:00
TredwellGit
eafbf22558 linux: 5.15.27 -> 5.15.28 2022-03-12 07:19:41 +00:00
TredwellGit
a9e63526e2 linux: 5.10.104 -> 5.10.105 2022-03-12 07:19:31 +00:00
TredwellGit
5de1f9ac31 linux: 4.9.305 -> 4.9.306 2022-03-12 07:19:22 +00:00
TredwellGit
3d434fc0d9 linux: 4.19.233 -> 4.19.234 2022-03-12 07:19:15 +00:00
TredwellGit
ceafc68dce linux: 4.14.270 -> 4.14.271 2022-03-12 07:19:08 +00:00
github-actions[bot]
a9a2d9475d Merge staging-next into staging 2022-03-11 18:01:59 +00:00
github-actions[bot]
7573d7fe79 Merge master into staging-next 2022-03-11 18:01:20 +00:00
André Silva
3ee99c82c4 Merge pull request #161868 from fortuneteller2k/xanmod-tt
linux_xanmod: 5.15.24 -> 5.15.27
2022-03-11 16:58:58 +00:00
fortuneteller2k
c0ca1422e7 linux_xanmod: 5.15.24 -> 5.15.27 2022-03-11 20:04:12 +08:00
Alyssa Ross
fb079c3110 linux.configfile: fix alts containing "/m"
generate-config.pl's auto modules feature answers "m" to any Kconfig
question it thinks supports being a module.  It detected this by
seeing if the help shown by make config (called "alts" by the script)
contained the string "/m", which it would in the case of e.g a
tristate option, where alts would be "N/m/y/?".

But then along came CONFIG_MODPROBE_PATH in Linux 5.13, with a default
value, shown in the make config help, of "/sbin/modprobe".
generate-config.pl would see the "/m" substring, and answer "m" to the
question, meaning (I think) that the built kernel would expect the
modprobe binary to be at /m.  This broke the (non-NixOS) VM images I
build with Nix.  NixOS was unaffected because it uses a different
mechanism to set the modprobe path.

With the current architecture, we can't 100% determine whether a
Kconfig option is a string or a tristate, but we can get a lot closer
by using a better regex.  My new regex only accepts single word
characters, separated by slashes, with a "/?" at the end.  This is
much less likely to ever end up as the default value of a string
option.

Tested by building linux_latest.configfile before and after my
changes, and checking the only difference is the correct default for
CONFIG_MODPROBE_PATH.
2022-03-10 11:13:11 +00:00
github-actions[bot]
f6b4a4048a Merge staging-next into staging 2022-03-09 12:01:59 +00:00
github-actions[bot]
201cc2f89b Merge master into staging-next 2022-03-09 00:02:05 +00:00
TredwellGit
109f094395 linux-rt_5_4: 5.4.177-rt69 -> 5.4.182-rt70 2022-03-08 19:23:59 +00:00
TredwellGit
eff61b45d0 linux: 5.4.182 -> 5.4.183 2022-03-08 19:23:28 +00:00
TredwellGit
d7d0cf60f9 linux: 5.16.12 -> 5.16.13 2022-03-08 19:23:19 +00:00
TredwellGit
639fd7c52a linux: 5.15.26 -> 5.15.27 2022-03-08 19:23:11 +00:00
TredwellGit
d095019a82 linux: 5.10.103 -> 5.10.104 2022-03-08 19:23:03 +00:00
TredwellGit
f22e8f94cf linux: 4.9.304 -> 4.9.305 2022-03-08 19:22:55 +00:00
TredwellGit
ba5cca9c79 linux: 4.19.232 -> 4.19.233 2022-03-08 19:22:48 +00:00
TredwellGit
e2aab2e9fd linux: 4.14.269 -> 4.14.270 2022-03-08 19:22:38 +00:00
Nick Cao
72db02ec9e kernel: add perl to moduleBuildDependencies 2022-03-07 12:23:43 +08:00
github-actions[bot]
137a689db1 Merge staging-next into staging 2022-03-07 00:02:59 +00:00
github-actions[bot]
b4b1ce4d4f Merge master into staging-next 2022-03-07 00:02:12 +00:00
Vladimír Čunát
7075835950 Merge #159237: linuxKernel.packages.linux_4_4: drop 2022-03-06 19:38:07 +01:00
Vladimír Čunát
485c8dd876 Merge #161362: linux_zen: 5.16.8 -> 5.16.11 2022-03-06 19:38:00 +01:00
Artturi
ef67e135e9 Merge pull request #160539 from danielfullmer/kernel-iso9660
linux: enable ISO9660_FS module
2022-03-06 11:13:45 +02:00