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

Use known license string for zlua #11113

Merged
merged 1 commit into from
Oct 27, 2020
Merged

Conversation

behlendorf
Copy link
Contributor

Motivation and Context

Issue #11112

Description

The Linux kernel MODULE_LICENSE macro only recognizes a handful of
license strings and "MIT" is not one of the them. Update the macro
to use "Dual MIT/GPL" which is recognized and what the kernel expects
MIT licensed modules to use.

How Has This Been Tested?

Manually loaded and inspected.

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:

The Linux kernel MODULE_LICENSE macro only recognizes a handful of
license strings and "MIT" is not one of the them.  Update the macro
to use "Dual MIT/GPL" which is recognized and what the kernel expects
MIT licensed modules to use.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue openzfs#11112
@behlendorf behlendorf added the Type: Building Indicates an issue related to building binaries label Oct 26, 2020
@codecov
Copy link

codecov bot commented Oct 27, 2020

Codecov Report

Merging #11113 into master will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #11113      +/-   ##
==========================================
- Coverage   79.56%   79.50%   -0.06%     
==========================================
  Files         398      398              
  Lines      125754   125754              
==========================================
- Hits       100060    99986      -74     
- Misses      25694    25768      +74     
Flag Coverage Δ
#kernel 80.37% <ø> (-0.12%) ⬇️
#user 64.95% <ø> (-0.08%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
module/lua/lapi.c 65.18% <ø> (ø)
module/os/linux/spl/spl-zlib.c 55.35% <0.00%> (-28.58%) ⬇️
module/zcommon/zfs_fletcher.c 68.09% <0.00%> (-7.57%) ⬇️
cmd/zvol_id/zvol_id_main.c 76.31% <0.00%> (-5.27%) ⬇️
module/zfs/bpobj.c 86.86% <0.00%> (-3.76%) ⬇️
module/zcommon/zfs_fletcher_superscalar.c 97.05% <0.00%> (-2.95%) ⬇️
module/zfs/vdev_raidz.c 89.57% <0.00%> (-2.72%) ⬇️
cmd/ztest/ztest.c 73.29% <0.00%> (-2.11%) ⬇️
module/os/linux/zfs/vdev_file.c 80.55% <0.00%> (-1.86%) ⬇️
cmd/zed/agents/fmd_api.c 88.61% <0.00%> (-1.78%) ⬇️
... and 56 more

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 3928ec5...da45022. Read the comment docs.

@ndanyluk
Copy link

I had to modify this commit to merge into 0.8.5-1 on my system (module macros aren't wrapped with "ZFS_" on the 0.8.y branch), but this did the trick. I'm able to run 0.8.5-1 on Ubuntu 20.04 ARM64 without errors now. Any chance we could backport this to 0.8.6 (which supports 5.9) or even a 0.8.5-2 (if it's intended to support 5.9)?

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Type: Building Indicates an issue related to building binaries labels Oct 27, 2020
@behlendorf behlendorf merged commit 4ce728d into openzfs:master Oct 27, 2020
@behlendorf
Copy link
Contributor Author

Yup, we'll get it back ported for the next point release.

ghost pushed a commit to zfsonfreebsd/ZoF that referenced this pull request Oct 30, 2020
The Linux kernel MODULE_LICENSE macro only recognizes a handful of
license strings and "MIT" is not one of the them.  Update the macro
to use "Dual MIT/GPL" which is recognized and what the kernel expects
MIT licensed modules to use.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#11112
Closes openzfs#11113
behlendorf added a commit that referenced this pull request Oct 30, 2020
The Linux kernel MODULE_LICENSE macro only recognizes a handful of
license strings and "MIT" is not one of the them.  Update the macro
to use "Dual MIT/GPL" which is recognized and what the kernel expects
MIT licensed modules to use.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #11112
Closes #11113
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
The Linux kernel MODULE_LICENSE macro only recognizes a handful of
license strings and "MIT" is not one of the them.  Update the macro
to use "Dual MIT/GPL" which is recognized and what the kernel expects
MIT licensed modules to use.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#11112
Closes openzfs#11113
@behlendorf behlendorf deleted the issue-11112 branch April 19, 2021 19:21
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
The Linux kernel MODULE_LICENSE macro only recognizes a handful of
license strings and "MIT" is not one of the them.  Update the macro
to use "Dual MIT/GPL" which is recognized and what the kernel expects
MIT licensed modules to use.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#11112
Closes openzfs#11113
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