diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-23 22:29:40 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-23 22:29:40 +0200 |
| commit | 713a34942fd6d29c48947efa18f2eb0fac97bc9a (patch) | |
| tree | 019e57fa6b8127d91270fa1792549e050448a725 /patch-5.13.0-redhat.patch | |
| parent | 481402a568d58bec4f0fd5fda64dd15a78c2cdec (diff) | |
| parent | a3e5988e12642b0e3c98bce30fd8bee8deb2c091 (diff) | |
| download | kernel-713a34942fd6d29c48947efa18f2eb0fac97bc9a.tar.gz kernel-713a34942fd6d29c48947efa18f2eb0fac97bc9a.tar.xz kernel-713a34942fd6d29c48947efa18f2eb0fac97bc9a.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc7.20210623git0c18f29aae7c.53.vanilla.1.fc35
Diffstat (limited to 'patch-5.13.0-redhat.patch')
| -rw-r--r-- | patch-5.13.0-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index 2ac0140b9..83e939899 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -2573,10 +2573,10 @@ index 684a6061a13a..220579c0e963 100644 * if the commandline contains a ':', then that's the extended * syntax -- if not, it must be the classic syntax diff --git a/kernel/module.c b/kernel/module.c -index 7e78dfabca97..5095efe4d1e1 100644 +index 927d46cb8eb9..387e08c31633 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -738,6 +738,7 @@ static struct module_attribute modinfo_##field = { \ +@@ -742,6 +742,7 @@ static struct module_attribute modinfo_##field = { \ MODINFO_ATTR(version); MODINFO_ATTR(srcversion); @@ -2584,7 +2584,7 @@ index 7e78dfabca97..5095efe4d1e1 100644 static char last_unloaded_module[MODULE_NAME_LEN+1]; -@@ -1202,6 +1203,7 @@ static struct module_attribute *modinfo_attrs[] = { +@@ -1206,6 +1207,7 @@ static struct module_attribute *modinfo_attrs[] = { &module_uevent, &modinfo_version, &modinfo_srcversion, |