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

linuxKernel.kernels.linux_zen: sync config with upstream #326216

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

thiagokokada
Copy link
Contributor

Description of changes

Sync linux-zen/linux-lqx configuration with upstream.

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.

@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Jul 10, 2024
@thiagokokada

This comment was marked as outdated.

@thiagokokada thiagokokada force-pushed the linux-zen-sync-config branch from ecc2d85 to e147827 Compare July 10, 2024 23:49
@thiagokokada
Copy link
Contributor Author

@ofborg build linuxKernel.kernels.linux_zen linuxKernel.kernels.linux_lqx

@thiagokokada
Copy link
Contributor Author

CC @JerrySM64 for review.

@ofborg ofborg bot requested a review from JerrySM64 July 11, 2024 01:05
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500 labels Jul 11, 2024
Copy link
Member

@JerrySM64 JerrySM64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing I found is that the option CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y from lqx upstream is now completely missing here. Is that meant to be that way? I mean not too long ago we had to force Nix to use LZ4 for this kernel as it doesn't build with ZSTD.

Speaking of build failure, would you take a look at OfBorg's log, please? Looks like something went wrong while building.

@thiagokokada thiagokokada force-pushed the linux-zen-sync-config branch from e147827 to a993b24 Compare July 11, 2024 15:44
@thiagokokada thiagokokada force-pushed the linux-zen-sync-config branch from a993b24 to 0f8c498 Compare July 11, 2024 15:47
@thiagokokada
Copy link
Contributor Author

@ofborg build linuxKernel.kernels.linux_zen linuxKernel.kernels.linux_lqx

@ofborg ofborg bot requested a review from JerrySM64 July 11, 2024 16:18
Copy link
Member

@JerrySM64 JerrySM64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thiagokokada thiagokokada merged commit 25227b0 into NixOS:master Jul 11, 2024
27 of 31 checks passed
@thiagokokada thiagokokada deleted the linux-zen-sync-config branch July 11, 2024 17:12
midirhee12 pushed a commit to midirhee12/nixpkgs that referenced this pull request Jul 28, 2024
linuxKernel.kernels.linux_zen: sync config with upstream
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 8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants