summaryrefslogtreecommitdiffstats
path: root/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-08-17 11:18:16 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-08-17 11:18:16 -0500
commitfa13b59d638eb5dd773694de898e8f99d1d85526 (patch)
tree7f0f14a3ed6c0df2ee72ff6a4c766693dda74eb3 /0001-modules-add-rhelversion-MODULE_INFO-tag.patch
parentf7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff)
downloadkernel-fa13b59d638eb5dd773694de898e8f99d1d85526.tar.gz
kernel-fa13b59d638eb5dd773694de898e8f99d1d85526.tar.xz
kernel-fa13b59d638eb5dd773694de898e8f99d1d85526.zip
kernel-5.9.0-0.rc1.1
* Mon Aug 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.1] - v5.9-rc1 rebase - Config updates for Fedora ("Justin M. Forbes") - fedora: enable enery model (Peter Robinson) - iio: enable LTR-559 light and proximity sensor (Peter Robinson) - iio: chemical: enable some popular chemical and partical sensors (Peter Robinson) - More mismatches ("Justin M. Forbes") - Fedora config change due to deps ("Justin M. Forbes") - CONFIG_SND_SOC_MAX98390 is now selected by SND_SOC_INTEL_DA7219_MAX98357A_GENERIC ("Justin M. Forbes") - Config change required for build part 2 ("Justin M. Forbes") - Config change required for build ("Justin M. Forbes") - Enable ARM_SMCCC_SOC_ID on all aarch64 kernels (Peter Robinson) - Enable ZSTD compression algorithm on all kernels (Peter Robinson) - Fedora config update ("Justin M. Forbes") - Revert "Merge branch 'make_configs_fix' into 'os-build'" (Justin Forbes) - Use the configs/generic config for SND_HDA_INTEL everywhere (Peter Robinson) - redhat/configs/process_configs.sh: Remove *.config.orig files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add process_configs_known_broken flag (Prarit Bhargava) - redhat/Makefile: Fix '*-configs' targets (Prarit Bhargava) - Updated changelog for the release based on v5.8 (Fedora Kernel Team) - Add ability to sync upstream through Makefile (Don Zickus) - Add master merge check (Don Zickus) - Replace hardcoded values 'os-build' and project id with variables (Don Zickus) - gitattributes: Remove unnecesary export restrictions (Prarit Bhargava) - redhat/Makefile.common: Fix MARKER (Prarit Bhargava) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-modules-add-rhelversion-MODULE_INFO-tag.patch')
-rw-r--r--0001-modules-add-rhelversion-MODULE_INFO-tag.patch8
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,