diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
commit | 5ec75f810f09a224ce0f77ba312599eb4c7321bc (patch) | |
tree | dcb2b1a0d97363e1a678726925d875c1bea151fa /0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch | |
parent | 11a8f14639c96c38e142ba04c87f50de9c557ba7 (diff) | |
parent | a71ee103a729754519abc15fd58e6b258a89e58b (diff) | |
download | kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.gz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.xz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.zip |
merge origin
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 | 6 |
1 files changed, 3 insertions, 3 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..995be15ad 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; @@ -119,5 +119,5 @@ index e1b22fe0916c..894eda427214 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); -- -2.26.2 +2.28.0 |