diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch | |
parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to '0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch')
-rw-r--r-- | 0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch b/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch index 8ffa070b4..d0f06be24 100644 --- a/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch +++ b/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch @@ -84,7 +84,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 e1b22fe0916c..894eda427214 100644 +index 737c0b6b24ea..7901e780323b 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -34,6 +34,7 @@ @@ -95,7 +95,7 @@ index e1b22fe0916c..894eda427214 100644 #define IPMI_DRIVER_VERSION "39.2" -@@ -5155,8 +5156,21 @@ static int __init ipmi_init_msghandler_mod(void) +@@ -5153,8 +5154,21 @@ static int __init ipmi_init_msghandler_mod(void) { int rv; |