diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-24 06:32:23 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-24 06:32:23 +0100 |
commit | b76dc660f8c41ef43153460bb21d713da08d4687 (patch) | |
tree | b60cbf2dbb3ab145919f7476a45f660f638f969f /patch-5.16-redhat.patch | |
parent | 866872f38c0b60a3a4ac3e8029e2006fa6ae9eab (diff) | |
parent | d8b7392fd8337ed42b13bbe1ef86f4c8a0a758df (diff) | |
download | kernel-b76dc660f8c41ef43153460bb21d713da08d4687.tar.gz kernel-b76dc660f8c41ef43153460bb21d713da08d4687.tar.xz kernel-b76dc660f8c41ef43153460bb21d713da08d4687.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc6.20211223gitbc491fb12513.44.vanilla.1.fc36kernel-5.16.0-0.rc6.20211223gitbc491fb12513.44.vanilla.1.fc35kernel-5.16.0-0.rc6.20211223gitbc491fb12513.44.vanilla.1.fc34
Diffstat (limited to 'patch-5.16-redhat.patch')
-rw-r--r-- | patch-5.16-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index c773f284c..0d518a3e0 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -620,7 +620,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index c837d5416e0e..ded4c912067e 100644 +index c59265146e9c..caa8458edde2 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -631,7 +631,7 @@ index c837d5416e0e..ded4c912067e 100644 #include <linux/delay.h> #define IPMI_DRIVER_VERSION "39.2" -@@ -5417,8 +5418,21 @@ static int __init ipmi_init_msghandler_mod(void) +@@ -5422,8 +5423,21 @@ static int __init ipmi_init_msghandler_mod(void) { int rv; |