Commit Graph

17219 Commits

Author SHA1 Message Date
Artturi
57013fb257
Merge pull request #149244 from Artturin/kmodpathpriority
kmod: switch the priority of module dirs
2021-12-09 05:49:53 +02:00
github-actions[bot]
777d4e2b31
Merge staging-next into staging 2021-12-08 06:02:07 +00:00
github-actions[bot]
8c220e0dcb
Merge master into staging-next 2021-12-08 06:01:30 +00:00
Artturin
86ae2154c2 kmod: add myself(artturin) as a maintainer 2021-12-08 02:56:40 +02:00
TredwellGit
04bbfd1b88 linux_5_14: remove
https://lwn.net/ml/linux-kernel/1637500331152110@kroah.com/
https://github.com/openzfs/zfs/issues/12786
2021-12-08 00:15:07 +00:00
TredwellGit
a93b636340 linux/hardened/patches/5.4: 5.4.160-hardened1 -> 5.4.163-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
a4a70dcab4 linux/hardened/patches/5.15: 5.15.3-hardened1 -> 5.15.6-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
55969e856c linux/hardened/patches/5.10: 5.10.80-hardened1 -> 5.10.83-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
cfd35502f6 linux/hardened/patches/4.19: 4.19.217-hardened1 -> 4.19.219-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
d2bfac4ff9 linux/hardened/patches/4.14: 4.14.255-hardened1 -> 4.14.256-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
b4a903e20d linux-rt_5_4: 5.4.154-rt65 -> 5.4.161-rt66 2021-12-08 00:15:07 +00:00
TredwellGit
962956db96 linux-rt_5_10: 5.10.78-rt55 -> 5.10.78-rt56 2021-12-08 00:15:07 +00:00
TredwellGit
8a260ea0f3 linux: 5.4.161 -> 5.4.163 2021-12-08 00:15:07 +00:00
TredwellGit
cd32471748 linux: 5.15.4 -> 5.15.6 2021-12-08 00:15:07 +00:00
TredwellGit
342e0a3df9 linux: 5.10.81 -> 5.10.83 2021-12-08 00:15:07 +00:00
TredwellGit
9fc610cf3f linux: 4.9.290 -> 4.9.291 2021-12-08 00:15:07 +00:00
TredwellGit
cc06653c46 linux: 4.4.292 -> 4.4.293 2021-12-08 00:15:07 +00:00
TredwellGit
0868920a42 linux: 4.19.217 -> 4.19.219 2021-12-08 00:15:07 +00:00
TredwellGit
f4f1bfd261 linux: 4.14.255 -> 4.14.256 2021-12-08 00:15:07 +00:00
github-actions[bot]
df0c1b8745
Merge staging-next into staging 2021-12-08 00:02:16 +00:00
Alyssa Ross
16fb150e03
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/libraries/libunwind/default.nix
2021-12-07 23:56:16 +00:00
ajs124
e764c08e81 lvm2: 2.03.12 -> 2.03.14 2021-12-07 13:17:42 +01:00
Martin Weinelt
96f5b351b2
iw: 5.9 -> 5.16 2021-12-07 11:30:47 +01:00
ajs124
e2f009e5a2 systemd: reference upstream discussion for 0019-core-handle-lookup-paths-being-symlinks.patch 2021-12-07 09:10:09 +00:00
Artturin
453968c01a kmod: switch the priority of module dirs
make "/run/booted-system/kernel-modules" be searched first

Fixes https://github.com/NixOS/nixpkgs/issues/146383
modprobe: ERROR: could not insert 'zram': Invalid argument
2021-12-07 06:20:59 +02:00
Arian van Putten
d4e4d27dff systemd: move systemd-tmpfiles-setup-dev.service back to early boot
It was originally moved because of nixops autoLuks feature which
has been unsupported for a while.

See:
* https://github.com/NixOS/nixpkgs/issues/62211
* https://github.com/NixOS/nixops/pull/1156#issuecomment-605339705

systemd-tmpfiles-setup-dev.service needs to run very  early (even before
udev runs) because udev rules assume static device nodes already exist
even before udev is started. If these static device nodes do not exist;
systemd might have trouble mounting filesystems that require static
device nodes (like loopfs and btrfs).
2021-12-06 14:40:07 +00:00
ajs124
32e30e84f6 systemd: align kmod-static-nodes.service with kmod paths 2021-12-06 14:39:41 +00:00
ajs124
84a769c071 systemd: 249.5 -> 249.7 2021-12-06 14:39:16 +00:00
github-actions[bot]
2aa3af36ca
Merge staging-next into staging 2021-12-06 12:01:55 +00:00
github-actions[bot]
41895efeb5
Merge master into staging-next 2021-12-06 12:01:16 +00:00
Jörg Thalheim
c7fa870f5a
Merge pull request #148535 from martinetd/bpf
bpf update: bcc remove linux kernel dep + devendor libbpf again, bpftrace 0.13.0 -> 0.14.0 + remove kernel dep, pahole 1.20 -> 1.22 + remove submodule, libbpf revert 0.6.0 -> 0.5.0 (unusable)
2021-12-06 08:33:14 +00:00
Jonathan Ringer
5263fb820e
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/django-rq/default.nix
	pkgs/top-level/all-packages.nix
2021-12-05 22:02:00 -08:00
github-actions[bot]
4c8e936858
Merge staging-next into staging 2021-12-06 00:02:26 +00:00
Dominique Martinet
fa857bb435 bpftrace: fix build with libbpf 0.6.0
libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of
btf_dump__new() but that's not valid c++.
see https://github.com/iovisor/bpftrace/issues/2068
2021-12-06 07:15:56 +09:00
markuskowa
a1ca92a931
Merge pull request #147960 from hjones2199/pps-up
pps-tools: 1.0.2 -> 1.0.3
2021-12-05 20:50:13 +01:00
Jörg Thalheim
423aff986c Merge remote-tracking branch 'upstream/master' into HEAD 2021-12-05 19:41:20 +01:00
Christian Kögler
7980f52d0c yabai: 3.3.4 -> 3.3.10 2021-12-05 19:15:43 +01:00
Jörg Thalheim
3c14d660f9
Merge pull request #148716 from Stunkymonkey/swift-corelibs-pname-version
swift-corelibs: use pname&version instead of name
2021-12-05 17:33:10 +00:00
Jörg Thalheim
3f47d85f94
Merge pull request #148702 from Stunkymonkey/treewide-pname-version-3
treewide: use pname&version instead of name
2021-12-05 17:27:34 +00:00
Ryan Mulligan
542e917e99
Merge pull request #148061 from astro/drbd_upstream
drbd: update, fix, add test
2021-12-05 09:10:22 -08:00
Felix Buehler
b40eaa1675 swift-corelibs: use pname&version instead of name 2021-12-05 15:39:48 +01:00
Felix Buehler
8d0267dc8f treewide: use pname&version instead of name 2021-12-05 15:38:17 +01:00
github-actions[bot]
2334077a68
Merge staging-next into staging 2021-12-05 12:01:53 +00:00
github-actions[bot]
89378919a6
Merge master into staging-next 2021-12-05 12:01:19 +00:00
Fabian Affolter
94722b8c03
Merge pull request #148648 from fabaff/bump-cpuid
cpuid: 20211114 -> 20211129
2021-12-05 09:51:49 +01:00
Sandro
c083769088
Merge pull request #147606 from kshlm/udisks-2.9.4 2021-12-05 07:44:12 +01:00
github-actions[bot]
7a62e25533
Merge staging-next into staging 2021-12-05 00:02:33 +00:00
github-actions[bot]
5a1288f93b
Merge master into staging-next 2021-12-05 00:01:53 +00:00
Fabian Affolter
62b03e2c39 cpuid: 20211114 -> 20211129 2021-12-05 00:23:39 +01:00
Sergei Trofimovich
134db1c397 sysdig: fix pending upstream inclusion for ncurses-6.3
Without the change the build fails as:

    sysdig/userspace/sinspui/cursescomponents.cpp: In member function 'void curses_textbox::print_no_data()':
    sysdig/userspace/sinspui/cursescomponents.cpp:878:15: error: format not a string literal and no format arguments [-Werror=format-security]
      878 |   wstr.c_str());
          |               ^
2021-12-04 19:34:21 +00:00