diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
commit | 9d8cc94b05933f016a226898842277611bafd566 (patch) | |
tree | 44bd1fc40427c8d932bb2d5bcac9f86b3b1feedc /0001-modules-add-rhelversion-MODULE_INFO-tag.patch | |
parent | 6243c80866b326be88265a9756403a577110d2d9 (diff) | |
parent | fa13b59d638eb5dd773694de898e8f99d1d85526 (diff) | |
download | kernel-9d8cc94b05933f016a226898842277611bafd566.tar.gz kernel-9d8cc94b05933f016a226898842277611bafd566.tar.xz kernel-9d8cc94b05933f016a226898842277611bafd566.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc1.1.vanilla.1.fc34kernel-5.9.0-0.rc1.1.vanilla.1.fc33kernel-5.9.0-0.rc1.1.vanilla.1.fc32kernel-5.9.0-0.rc1.1.vanilla.1.fc31
Diffstat (limited to '0001-modules-add-rhelversion-MODULE_INFO-tag.patch')
-rw-r--r-- | 0001-modules-add-rhelversion-MODULE_INFO-tag.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch index ea471e7c8..05608802a 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 2e6670860d27..8c35a5db7d7e 100644 +index e30ed5fa33a7..b960ea38d185 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -371,6 +371,7 @@ struct module { @@ -94,10 +94,10 @@ index 2e6670860d27..8c35a5db7d7e 100644 /* Exported symbols */ diff --git a/kernel/module.c b/kernel/module.c -index 8fa2600bde6a..263e654f6212 100644 +index 1c5cff34d9f2..670ceadd44d2 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -802,6 +802,7 @@ static struct module_attribute modinfo_##field = { \ +@@ -805,6 +805,7 @@ static struct module_attribute modinfo_##field = { \ MODINFO_ATTR(version); MODINFO_ATTR(srcversion); @@ -105,7 +105,7 @@ index 8fa2600bde6a..263e654f6212 100644 static char last_unloaded_module[MODULE_NAME_LEN+1]; -@@ -1266,6 +1267,7 @@ static struct module_attribute *modinfo_attrs[] = { +@@ -1267,6 +1268,7 @@ static struct module_attribute *modinfo_attrs[] = { &module_uevent, &modinfo_version, &modinfo_srcversion, |