Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.05] Backport kernel changes from #350757 #351145

Merged
merged 3 commits into from
Oct 27, 2024

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Oct 25, 2024

See #350757

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

K900 and others added 3 commits October 25, 2024 12:56
Expected to be more stable.

(cherry picked from commit dd50f99)
(cherry picked from commit 9b08aa0)
Closes NixOS#350681

The netfilter patch doesn't apply on the hardened branch. It will
(hopefully) be upstream anyways soon, so let's just ignore it here to
unbreak hardened for everyone else.

(cherry picked from commit db1e1ed)
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Oct 25, 2024
@K900 K900 merged commit e31c26b into NixOS:release-24.05 Oct 27, 2024
29 of 32 checks passed
@Ma27 Ma27 deleted the kernel-backports branch October 27, 2024 10:28
@ck3d
Copy link
Contributor

ck3d commented Nov 2, 2024

I have to run the latest kernel because of hardware driver issues together with zfs. Zfs still runs up to 6.10, which is now removed.
Please, increase the time between kernel EOL and kernel removal of nixpkgs on the stable branch of NixOS from 2 week to 8 weeks.

Jayman2000 added a commit to Jayman2000/jasons-nixos-config that referenced this pull request Nov 3, 2024
This reverts commit 0c2adf5. The
workaround from that commit no longer works because
pkgs.linuxKernel.packages.linux_6_10 has been removed from NixOS 24.05
[1]. I guess that I’ll have to find another workaround.

[1]: <NixOS/nixpkgs#351145>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants