diff options
| author | Charlotte 🦝 Delenk <lotte@chir.rs> | 2022-03-25 17:22:19 +0100 |
|---|---|---|
| committer | Madoura <madouura@gmail.com> | 2022-03-25 16:17:01 -0500 |
| commit | 565f3667d27b87947ccc238f6a82e74b57cb0b92 (patch) | |
| tree | e954667bbab99b0d01a38d44ac1d5d80ef7a9f7a | |
| parent | f3663942a3b46b947d7d6aa7b64720fc339c496c (diff) | |
linux_testing_bcachefs: 2022-03-09 -> 2022-03-21
This should fix a bug causing kernel panics when your fs has snapshots
enabled. See:
https://lore.kernel.org/all/bc622d24-9fad-7b3-22cb-da4bf2dd32d@ewheeler.net/T/
This patch also bumps the kernel version to 5.16, as bcachefs is devel-
oping against that now.
(cherry picked from commit 158789753f6d8ba7a55a83c79674e9667069a13e)
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 63d47dd8a384..e86f6fced569 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2022-03-09" -, commit ? "2280551cebc1735f74eef75d650dd5e175461657" -, diffHash ? "1mrrydidbapdq0fs0vpqhs88k6ghdrvmjpk2zi7xlwj7j32h0nwp" +, date ? "2022-03-21" +, commit ? "c38b7167aa5f3b1b91dcc93ade57f30e95064590" +, diffHash ? "04lgwnng7p2rlz9sxn74n22750kh524xwfws3agqs12pcrvfsm0j" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5b08d523052f..3a0c6d84d1c2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -179,7 +179,7 @@ in { else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_15; + kernel = linux_5_16; kernelPatches = kernel.kernelPatches; }; |