zfs: Linux 5.6 compatibility #84303
Closed
zfs: Linux 5.6 compatibility #84303
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emilazy
force-pushed
the
zfs-linux-5.6-compat
branch
2 times, most recently
from
162f659 to
d8ab465
Compare
The only conflict that wasn't automatically resolved was an addition in config/kernel.m4 with changed context. I took a basic look over the cherry-picked patches and nothing seems obviously incorrect.
emilazy
force-pushed
the
zfs-linux-5.6-compat
branch
from
d8ab465 to
3b36547
Compare
|
@GrahamcOfBorg test zfs |
ofborg
bot
added
10.rebuild-darwin: 0
veprbl
reviewed
Apr 5, 2020
10 tasks
10 tasks
|
Will try to test; the diff looks about the same to me, but I don't think grabbing a combined diff from a random gist is a great solution compared to the separated |
|
I reviewed the patch before adding it. |
|
Closing due to merge of substantially similar patch. @Mic92 A ping so I can know that there's no need to keep a patch rebased against master and can drop it from my local tree would be appreciated in future. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
I cherry-picked the Linux 5.6 compatibility patches from the latest OpenZFS master. This builds, boots, and passes tests for me with 5.6.2 (and the installer test exercises a pre-5.6 version). The backported patches are all quite simple, mostly dealing with the fallout of the 32-bit timepocalypse.
I've omitted openzfs/zfs@bd0d24e (openzfs/zfs#10072) because it depends on openzfs/zfs@066e825, which is a much more invasive change, and the PR message implies that it only breaks a non-NixOS-default kernel configuration, for a kernel version we don't ship as default/latest/testing, due to an upstream change that was an accident to begin with.
I initially wanted to bump zfsUnstable so that there'd be a pristine (albeit unreleased) upstream option for current kernels, but unfortunately the couple commits I checked broke the test with an ominous
cannot mount 'rpool': Input/output error. In the spirit of procrastination, let's hope whatever that is goes away by the time of the next upstream release.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)