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.

Sign up for GitHub

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

Jump to bottom

Fix kernel oops on boot due to bug in i2c driver. #60172

Merged
merged 1 commit into from Apr 26, 2019
Merged

Fix kernel oops on boot due to bug in i2c driver. #60172

merged 1 commit into from Apr 26, 2019

Conversation

ambrop72
Copy link
Contributor

#60126
https://lkml.org/lkml/2019/4/24/1123

The patch should be removed in the next round of stable releases because the fix should be included.

Motivation for this change

Kernel crash on boot, see #60126
I have verified that it fixes the issue with kernel 4.19.36. I added the patch for 4.14 and 4.9 as well because they are affected (they have the broken patch applies without the fix), but I only checked the build goes past the patch application.

This is pretty critical. An alternative to merging this would be to rollback the last kernel updates.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ambrop72
Copy link
Contributor Author

Also relevant for release-18.09 and master which also got the latest kernel updates.

@ambrop72
Copy link
Contributor Author

BTW, I sure hope that defining kernelPatches this way doesn't accidentally result in any other patches being ignored.

@rycee
Copy link
Member

rycee commented Apr 25, 2019 •
edited

@NeQuissimus If you have the chance, please have a look at this. It seems to affect quite a few people.

@ambrop72
Copy link
Contributor Author

BTW, I sure hope that defining kernelPatches this way doesn't accidentally result in any other patches being ignored.

Indeed this is the problem with this change, so it should not be merged as-is, seems like one needs to add together kernelPatches manually. I see that from comparing drvs using nix-diff.

@ambrop72
Fix kernel oops on boot due to bug in i2c driver.
4474b90 
NixOS#60126
https://lkml.org/lkml/2019/4/24/1123

The patch should be removed in the next round of stable releases because the fix should be included.
@ambrop72
Copy link
Contributor Author

Should be fixed now.

@NeQuissimus NeQuissimus merged commit 1e8a080 into NixOS:release-19.03 Apr 26, 2019
@NeQuissimus
Copy link
Member

Picked as 196979e (18.09) and a9c40ee (master)

@kionka kionka mentioned this pull request Apr 26, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ambrop72 @rycee @NeQuissimus