diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
| commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
| tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-modules-add-rhelversion-MODULE_INFO-tag.patch | |
| parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
| parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
| download | kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
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 ba72b5125..fc37505d0 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 e30ed5fa33a7..b960ea38d185 100644 +index 2e6670860d27..8c35a5db7d7e 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -371,6 +371,7 @@ struct module { @@ -94,10 +94,10 @@ index e30ed5fa33a7..b960ea38d185 100644 /* Exported symbols */ diff --git a/kernel/module.c b/kernel/module.c -index 1c5cff34d9f2..670ceadd44d2 100644 +index 8fa2600bde6a..263e654f6212 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -805,6 +805,7 @@ static struct module_attribute modinfo_##field = { \ +@@ -802,6 +802,7 @@ static struct module_attribute modinfo_##field = { \ MODINFO_ATTR(version); MODINFO_ATTR(srcversion); @@ -105,7 +105,7 @@ index 1c5cff34d9f2..670ceadd44d2 100644 static char last_unloaded_module[MODULE_NAME_LEN+1]; -@@ -1267,6 +1268,7 @@ static struct module_attribute *modinfo_attrs[] = { +@@ -1266,6 +1267,7 @@ static struct module_attribute *modinfo_attrs[] = { &module_uevent, &modinfo_version, &modinfo_srcversion, |