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

Kernel updates for 2024-09-30 #345534

Merged
merged 9 commits into from
Sep 30, 2024
Merged

Kernel updates for 2024-09-30 #345534

merged 9 commits into from
Sep 30, 2024

Conversation

K900
Copy link
Contributor

@K900 K900 commented Sep 30, 2024

Description of changes

No Rust yet, because 1.81 is in staging-next. staging-next PR to follow.

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.

- refactor Rust checks to prepare for enablement
- enable DRM panic QR codes when Rust is enabled
- enable I2C_DESIGNWARE_CORE explicitly for all the Bay Trail things
- enable all the zram backends because they're separate options now and basically free
- enable the new and returning module compression related options
- enable scx and NFS local IO
@K900 K900 requested review from alyssais and Ma27 September 30, 2024 15:43
@K900 K900 added the backport release-24.05 Backport PR automatically label Sep 30, 2024
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Sep 30, 2024
@Ma27
Copy link
Member

Ma27 commented Sep 30, 2024

Rest of the changes look good, builds/tests are still running. Would merge when this is done (and I'm back from grocery shopping).

@Ma27 Ma27 merged commit 115e75c into NixOS:master Sep 30, 2024
46 of 49 checks passed
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-345534-to-release-24.05 origin/release-24.05
cd .worktree/backport-345534-to-release-24.05
git switch --create backport-345534-to-release-24.05
git cherry-pick -x 5e8d28572a313515bc65ff11e4f642c9f72107f0 30c52da8a124c7396d3f60ccdaf5ed0ad7250ef3 8fa87fa112a0897411c3cbb859dac9c5c82cccf0 20380379dba41ba46a4a597b7afd74f5560acea6 7df132ae3e345ab8d41452e514e4548b1571b475 6290efed1503c0fe7095e612aded8a9476368a40 6c12dc70050611ec8d50343245d541336226c5c8 0ea0c2a7c6619b15e0dd9247bdd1d0cd62f28382 88746a794398da15142f91d42c829a4336616596

@K900 K900 mentioned this pull request Sep 30, 2024
13 tasks
@vcunat
Copy link
Member

vcunat commented Oct 3, 2024

FYI, this merge broke some rust stuff:
https://hydra.nixos.org/build/274222731

EDIT: that was 6.11; 6.10 link: https://hydra.nixos.org/build/274214211

@Ma27
Copy link
Member

Ma27 commented Oct 3, 2024

I think I've seen it on master, but not on staging-next anymore. Perhaps because the latter has rustc 1.81 already?

@vcunat
Copy link
Member

vcunat commented Oct 3, 2024

I reproduce the same error: unused option: RUST on the current staging-next (01dfa6b).

EDIT: all required binaries are in cache.nixos.org already (for x86_64), so it's easy to play with.

@Ma27
Copy link
Member

Ma27 commented Oct 3, 2024

Sorry, I mixed things up (while working on #345980 I had to isolate three distinct issues).

Yes, that's an issue on Linux 6.11 (and IIRC even 6.10?).
But tbh, Rust is experimental and IIRC there's nothing interesting in 6.11 and we have a working state for testing/6.12 with #345980 for both x86_64-linxu and aarch64-linux, so I'm inclined to just mark the Rust support as broken for these.

Opinions @alyssais @K900?

@alyssais
Copy link
Member

alyssais commented Oct 3, 2024

That sounds fine to me.

Ma27 added a commit to Ma27/nixpkgs that referenced this pull request Oct 5, 2024
Linux 6.7 is the oldest kernel with Rust support, so the config part
should fail hard if 6.6 or older requests the Rust feature. Until now
this was silently ignored[1].

It turned out that Rust for Linux 6.11 or older fails for unknown
reasons[2]. We decided to not bother since it's not a longterm kernel
and 6.12 seems fine again. As a result, marking this as broken.

[1] NixOS#345534 (comment)
[2] NixOS#345534 (comment)
thtrf pushed a commit to thtrf/nixpkgs that referenced this pull request Oct 12, 2024
Linux 6.7 is the oldest kernel with Rust support, so the config part
should fail hard if 6.6 or older requests the Rust feature. Until now
this was silently ignored[1].

It turned out that Rust for Linux 6.11 or older fails for unknown
reasons[2]. We decided to not bother since it's not a longterm kernel
and 6.12 seems fine again. As a result, marking this as broken.

[1] NixOS#345534 (comment)
[2] NixOS#345534 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: kernel The Linux kernel 10.rebuild-darwin: 1-10 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000 11.by: package-maintainer This PR was created by the maintainer of the package it changes backport release-24.05 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants