summaryrefslogtreecommitdiffstats
path: root/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-02 21:01:33 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-02 21:01:33 +0200
commit02ba673575de31650bcb39d7cfe0224bf1b7b449 (patch)
tree77ab559fd57445dc54d568b361dc54ef7b6ee3a8 /0001-modules-add-rhelversion-MODULE_INFO-tag.patch
parent74ab72ba21a4bb026b91637fd91ef20edef750a0 (diff)
parentfa1dee0747e32fcab94c1695e980d192cc8bac51 (diff)
downloadkernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33.tar.gz
kernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33.tar.xz
kernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33
Diffstat (limited to '0001-modules-add-rhelversion-MODULE_INFO-tag.patch')
-rw-r--r--0001-modules-add-rhelversion-MODULE_INFO-tag.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
index 5fbcc61e2..cd87459ff 100644
--- a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
+++ b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
@@ -82,7 +82,7 @@ Acked-by: Prarit Bhargava <prarit@redhat.com>
3 files changed, 11 insertions(+)
diff --git a/include/linux/module.h b/include/linux/module.h
-index 1ad393e62bef..3fb19abee033 100644
+index d849d06e4d44..15a1f464ba50 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -371,6 +371,7 @@ struct module {
@@ -94,7 +94,7 @@ index 1ad393e62bef..3fb19abee033 100644
/* Exported symbols */
diff --git a/kernel/module.c b/kernel/module.c
-index 646f1e2330d2..aed5b1fcadf8 100644
+index 64a2b4daaaa5..821a1d681971 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -799,6 +799,7 @@ static struct module_attribute modinfo_##field = { \
@@ -114,7 +114,7 @@ index 646f1e2330d2..aed5b1fcadf8 100644
&modinfo_coresize,
&modinfo_initsize,
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index 5c3c50c5ec52..188eb460cede 100644
+index 0053d4fea847..a6ccaf207413 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -21,6 +21,7 @@