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-testing 4.14-rc2 -> 4.15-rc1 #32137

Closed
wants to merge 1 commit into from
Closed

linux-testing 4.14-rc2 -> 4.15-rc1 #32137

wants to merge 1 commit into from

Conversation

pstn
Copy link
Contributor

@pstn pstn commented Nov 28, 2017

Motivation for this change

Bump up linux-testing version.
Sending this PR from the running kernel, which should be enough test for testing, I think.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@@ -1,4 +1,6 @@
{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, libelf ? null
, eject ? null
Copy link
Contributor

Choose a reason for hiding this comment

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

utillinux, not eject.

Otherwise looks good.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, makes sense. Building the new version.

@pstn
Copy link
Contributor Author

pstn commented Nov 28, 2017

Why is the label rebuild-darwn assigned here? Isn't the kernel completely linux specific?

@Mic92
Copy link
Member

Mic92 commented Nov 28, 2017

the labels say that none rebuilds are triggered on both architectures.

@@ -12577,7 +12577,6 @@ with pkgs;
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
Copy link
Member

Choose a reason for hiding this comment

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

Are those upstream now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As I understand, they are with this commit. torvalds/linux@d18bee4

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah that's right, after two months of pings I got them in.

dezgeg added a commit that referenced this pull request Nov 28, 2017
This reverts commit 9335f1d.

Doesn't compile, a working version is at #32137.
@dezgeg dezgeg closed this in e8fcced Nov 28, 2017
dezgeg pushed a commit that referenced this pull request Dec 3, 2017
Closes #32137

 Conflicts:
	pkgs/os-specific/linux/kernel/manual-config.nix

[dezgeg: I picked this because it contains the bits that will be needed
once 4.15 is out]
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

4 participants