summaryrefslogtreecommitdiffstats
path: root/patch-5.14.0-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-07-08 14:57:58 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-07-08 14:57:58 -0500
commit380d6c25863b5edd89b68cda24e0f4dfae5cbc25 (patch)
tree5cfa3518b1f5cd1e793be05a47ce80c0387511fb /patch-5.14.0-redhat.patch
parent7ab3430578bb44245900b015eefd4644be051cfe (diff)
downloadkernel-380d6c25863b5edd89b68cda24e0f4dfae5cbc25.tar.gz
kernel-380d6c25863b5edd89b68cda24e0f4dfae5cbc25.tar.xz
kernel-380d6c25863b5edd89b68cda24e0f4dfae5cbc25.zip
kernel-5.14.0-0.rc0.20210708gite9f1cbc0c411.13
* Thu Jul 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210708gite9f1cbc0c411.13] - Fix the perf trace link location (Justin M. Forbes) - drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 (Michal Suchanek) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.14.0-redhat.patch')
-rw-r--r--patch-5.14.0-redhat.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch
index ee008a1dd..b82876483 100644
--- a/patch-5.14.0-redhat.patch
+++ b/patch-5.14.0-redhat.patch
@@ -293,10 +293,10 @@ index b58ee83f30e3..66e08b5d86d3 100644
/* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index a99d00393206..2ca44d88e832 100644
+index 64b805bd6a54..e6702f1e1beb 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
-@@ -1308,6 +1308,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
+@@ -1304,6 +1304,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
cpu_detect(c);
get_cpu_vendor(c);
get_cpu_cap(c);
@@ -2487,7 +2487,7 @@ index e343f158e556..840c5ecd4fc6 100644
if (err)
return err;
diff --git a/kernel/module.c b/kernel/module.c
-index 927d46cb8eb9..387e08c31633 100644
+index 64bd61b2d3ad..c1a2a8a29248 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -742,6 +742,7 @@ static struct module_attribute modinfo_##field = { \
@@ -2498,7 +2498,7 @@ index 927d46cb8eb9..387e08c31633 100644
static char last_unloaded_module[MODULE_NAME_LEN+1];
-@@ -1206,6 +1207,7 @@ static struct module_attribute *modinfo_attrs[] = {
+@@ -1205,6 +1206,7 @@ static struct module_attribute *modinfo_attrs[] = {
&module_uevent,
&modinfo_version,
&modinfo_srcversion,