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

Linux kernels 2024-03-05 #298948

Merged
merged 4 commits into from Mar 27, 2024
Merged

Linux kernels 2024-03-05 #298948

merged 4 commits into from Mar 27, 2024

Conversation

alyssais
Copy link
Member

Description of changes

@K900 I see you added DAMON — they've deprecated DAMON debugfs and moved it under DAMON_DBGFS_DEPRECATED. Do you think we should enable that config option, or just axe it from 6.9 onwards?

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@alyssais
Copy link
Member Author

@ofborg test kernel-generic.linux_testing

@K900
Copy link
Contributor

K900 commented Mar 25, 2024

I think we should be OK to just kill it, if that's what upstream does.

@alyssais alyssais marked this pull request as ready for review March 25, 2024 15:12
@alyssais alyssais added the backport release-23.11 Backport PR automatically label Mar 25, 2024
@K900 K900 merged commit fd2ac5b into NixOS:master Mar 27, 2024
27 checks passed
@K900
Copy link
Contributor

K900 commented Mar 27, 2024

Merging this so I can base the next stable update off of it.

Copy link
Contributor

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

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

git fetch origin release-23.11
git worktree add -d .worktree/backport-298948-to-release-23.11 origin/release-23.11
cd .worktree/backport-298948-to-release-23.11
git switch --create backport-298948-to-release-23.11
git cherry-pick -x c7a64c7213bdd765b90641549f5365b78b779776 51390627059ad7d288e04b85b3fc75ca95d2ca0e fb2f48c42b2dc62cec14feff8c687368246c3f67 c9729a3d77cfa2722ae9c0ad4c23cc3027359cca

@K900 K900 mentioned this pull request Mar 27, 2024
13 tasks
K900 added a commit that referenced this pull request Mar 27, 2024
@Ma27
Copy link
Member

Ma27 commented Mar 27, 2024

Apologies for not leaving a review earlier!
Changes look good, I just didn't get to testing them so far, so I haven't left a review here.

@alyssais alyssais deleted the linux-6.9-rc1 branch March 27, 2024 13:06
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.

None yet

3 participants