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 5.3 compat: Makefile subdir-m no longer supported. #9169

Merged
merged 1 commit into from
Aug 19, 2019
Merged

Linux 5.3 compat: Makefile subdir-m no longer supported. #9169

merged 1 commit into from
Aug 19, 2019

Conversation

dspearson
Copy link
Contributor

@dspearson dspearson commented Aug 15, 2019

Uses obj-m instead, due to kernel changes.

See LKML: [PATCH 3/3] kbuild: show hint if subdir-y/m is used to visit module Makefile

Motivation and Context

zfs fails to build on linux-5.3

Description

Trivial change to the Makefile.in to replace subdir-m with obj-m as per the LKML thread.

How Has This Been Tested?

"It works on my machine." zfs module successfully builds and loads on 5.3.0-rc4 with these changes.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

@tonyhutter
Copy link
Contributor

Whoa, I just pushed out the same fix (#9170) and then saw this PR. Since you beat me to it, can you incorporate my .gitignore changes (20a3fe0#diff-a084b794bc0759e7a6b77810e01874f2) and I'll approve your PR?

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Aug 15, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
@dspearson
Copy link
Contributor Author

I incorprated the .gitignore changes as requested. I note that some tests failed - I am not convinced my changes had anything to do with it though, and restarting the build may lead to a different result. I don't think I have the ability to do that though, sorry.

@codecov
Copy link

codecov bot commented Aug 16, 2019

Codecov Report

Merging #9169 into master will increase coverage by 0.12%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9169      +/-   ##
==========================================
+ Coverage   79.02%   79.14%   +0.12%     
==========================================
  Files         400      400              
  Lines      121841   121831      -10     
==========================================
+ Hits        96286    96428     +142     
+ Misses      25555    25403     -152
Flag Coverage Δ
#kernel 79.73% <ø> (+0.06%) ⬆️
#user 66.85% <ø> (+0.13%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0f8ff49...a30e23e. Read the comment docs.

@behlendorf behlendorf requested a review from tonyhutter August 16, 2019 14:47
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Aug 19, 2019
@behlendorf behlendorf merged commit ff4b68e into openzfs:master Aug 19, 2019
@dspearson dspearson deleted the linux-5.3-compat branch August 20, 2019 09:29
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 21, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
Closes openzfs#9169
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 22, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
Closes openzfs#9169
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 23, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
Closes openzfs#9169
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 17, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
Closes openzfs#9169
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 18, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
Closes openzfs#9169
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 23, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
Closes openzfs#9169
tonyhutter pushed a commit that referenced this pull request Sep 26, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
Closes #9169
snajpa pushed a commit to vpsfreecz/zfs that referenced this pull request Oct 19, 2019
Uses obj-m instead, due to kernel changes.

See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Dominic Pearson <dsp@technoanimal.net>
Closes openzfs#9169
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants