diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-03 16:45:11 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-03 16:45:11 +0200 |
commit | 76aaf5ee07624bd9dbdc426e38a4059bf56f52e5 (patch) | |
tree | 9392ac81841d28a8f5fd07814de421fbb772df56 /0001-modules-add-rhelversion-MODULE_INFO-tag.patch | |
parent | d5f831500b4b36dba3f9bae6e8ac14266b495790 (diff) | |
parent | 4403d9295a23adb83010ef08e1d4bbf481057131 (diff) | |
download | kernel-5.8.0-1.vanilla.1.fc31.tar.gz kernel-5.8.0-1.vanilla.1.fc31.tar.xz kernel-5.8.0-1.vanilla.1.fc31.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-1.vanilla.1.fc33kernel-5.8.0-1.vanilla.1.fc32kernel-5.8.0-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 | 6 |
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 78254541d..6990cc271 100644 --- a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch +++ b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch @@ -114,7 +114,7 @@ index aa183c9ac0a2..dc323b3f5838 100644 &modinfo_coresize, &modinfo_initsize, diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 45f2ab2ec2d4..3bf849a0c6ab 100644 +index 69341b36f271..dbc63328187c 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -21,6 +21,7 @@ @@ -125,7 +125,7 @@ index 45f2ab2ec2d4..3bf849a0c6ab 100644 /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; -@@ -2392,6 +2393,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -2393,6 +2394,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -138,7 +138,7 @@ index 45f2ab2ec2d4..3bf849a0c6ab 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2644,6 +2651,7 @@ int main(int argc, char **argv) +@@ -2645,6 +2652,7 @@ int main(int argc, char **argv) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); |