diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-03 18:25:09 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-03 18:25:09 +0100 |
commit | 67fc8f1e0c941be1161c810e94c9083c3433dcfa (patch) | |
tree | bc9ed3cf21a22bb706dc7b89256a9acfac939fbe /patch-5.16-redhat.patch | |
parent | 35a746e05a54678c08bf3aa4823791f607848317 (diff) | |
parent | 4b36b01cdc9ce70240b0089d6970bc9181379ac3 (diff) | |
download | kernel-67fc8f1e0c941be1161c810e94c9083c3433dcfa.tar.gz kernel-67fc8f1e0c941be1161c810e94c9083c3433dcfa.tar.xz kernel-67fc8f1e0c941be1161c810e94c9083c3433dcfa.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc3.20211203git5f58da2befa5.26.vanilla.1.fc35kernel-5.16.0-0.rc3.20211203git5f58da2befa5.26.vanilla.1.fc34
Diffstat (limited to 'patch-5.16-redhat.patch')
-rw-r--r-- | patch-5.16-redhat.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index ebc8b3b8b..b2da473e3 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -619,7 +619,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 deed355422f4..5199fb71a7e7 100644 +index c837d5416e0e..ded4c912067e 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -630,7 +630,7 @@ index deed355422f4..5199fb71a7e7 100644 #include <linux/delay.h> #define IPMI_DRIVER_VERSION "39.2" -@@ -5394,8 +5395,21 @@ static int __init ipmi_init_msghandler_mod(void) +@@ -5417,8 +5418,21 @@ static int __init ipmi_init_msghandler_mod(void) { int rv; @@ -1520,7 +1520,7 @@ index 8b2adc56b92a..f0ad908048c6 100644 err_nl_init: diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c -index 75dbe77b0b4b..029ff8576f8e 100644 +index ee4da9ab8013..0f217997a764 100644 --- a/drivers/net/wireguard/main.c +++ b/drivers/net/wireguard/main.c @@ -12,6 +12,7 @@ @@ -1531,7 +1531,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644 #include <linux/init.h> #include <linux/module.h> #include <linux/genetlink.h> -@@ -21,6 +22,11 @@ static int __init mod_init(void) +@@ -21,6 +22,11 @@ static int __init wg_mod_init(void) { int ret; @@ -1543,7 +1543,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644 ret = wg_allowedips_slab_init(); if (ret < 0) goto err_allowedips; -@@ -48,6 +54,7 @@ static int __init mod_init(void) +@@ -48,6 +54,7 @@ static int __init wg_mod_init(void) pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n"); pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.\n"); |