diff --git a/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch b/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch
new file mode 100644
index 0000000..4f933f9
--- /dev/null
+++ b/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch
@@ -0,0 +1,46 @@
+From 74730b2187402e29c3c6b4074eae945b7614d1dc Mon Sep 17 00:00:00 2001
+From: Mohammed Gamal <mgamal@redhat.com>
+Date: Tue, 8 Nov 2022 16:20:17 +0100
+Subject: [PATCH 1/3] redhat: hv_set_if_config: Workaround for gateway
+ numbering in NetworkManager
+
+RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-MergeRequest: 4: redhat: hv_set_if_config: Workaround for gateway numbering in NetworkManager
+RH-Bugzilla: 2122115
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Commit: [1/1] 5fef25a723094255f3cb25beaa4e18f1ec9d339f
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2122115
+
+Unlike older sysconfig scripts, NetworkManager expects GATEWAYx=ipaddr for all values of x.
+So the first gateway is GATEWAY0 instead of GATEWAY. Other values should remain unchanged.
+Workaround this by replacing GATEWAY= with GATEWAY0=.
+
+A proper fix however, would be to generate NetworkManager keyfiles instead of ifcfg files.
+That can be done eitter by changing hypervkvpd code to do that or to let the script parse
+ifcfg files and generate corresponding NetworkManager keyfiles
+
+Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
+---
+ hv_set_ifconfig.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
+index 146829b..fe7fccf 100644
+--- a/hv_set_ifconfig.sh
++++ b/hv_set_ifconfig.sh
+@@ -54,6 +54,10 @@ echo "IPV6INIT=yes" >> $1
+ echo "PEERDNS=yes" >> $1
+ echo "ONBOOT=yes" >> $1
+
++#Unlike older sysconfig scripts, NetworkManager expects GATEWAYx=ipaddr for all values of x.
++#So the first gateway is GATEWAY0 instead of GATEWAY. Other values should remain unchanged.
++#Workaround this by replacing GATEWAY= with GATEWAY0=.
++sed -i "s/GATEWAY=/GATEWAY0=/" $1
+
+ cp $1 /etc/sysconfig/network-scripts/
+
+--
+2.31.1
+
diff --git a/SOURCES/hpvd-tools-hv-Remove-an-extraneous-the.patch b/SOURCES/hpvd-tools-hv-Remove-an-extraneous-the.patch
new file mode 100644
index 0000000..2a200c0
--- /dev/null
+++ b/SOURCES/hpvd-tools-hv-Remove-an-extraneous-the.patch
@@ -0,0 +1,47 @@
+From 18888d66ca55ebefbf36dc74ab25c3958d56789b Mon Sep 17 00:00:00 2001
+From: Mohammed Gamal <mgamal@redhat.com>
+Date: Thu, 17 Nov 2022 18:56:20 +0100
+Subject: [PATCH 2/3] tools: hv: Remove an extraneous "the"
+
+RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-MergeRequest: 5: Update hyperv-daemons for RHEL-9.2
+RH-Bugzilla: 2139457
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/2] 53bf20c6a219a20e7a2ae3986a9b2ed43ac4faac
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139457
+
+commit f15f39fabed2248311607445ddfa6dba63abebb9
+Author: Jason Wang <wangborong@cdjrlc.com>
+Date: Thu Aug 11 21:34:33 2022 +0800
+
+ tools: hv: Remove an extraneous "the"
+
+ There are two "the" in the text. Remove one.
+
+ Signed-off-by: Jason Wang <wangborong@cdjrlc.com>
+ Link: https://lore.kernel.org/r/20220811133433.10175-1-wangborong@cdjrlc.com
+ Signed-off-by: Wei Liu <wei.liu@kernel.org>
+
+Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
+---
+ hv_kvp_daemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
+index c06c94d..5f98bee 100644
+--- a/hv_kvp_daemon.c
++++ b/hv_kvp_daemon.c
+@@ -44,7 +44,7 @@
+
+ /*
+ * KVP protocol: The user mode component first registers with the
+- * the kernel component. Subsequently, the kernel component requests, data
++ * kernel component. Subsequently, the kernel component requests, data
+ * for the specified keys. In response to this message the user mode component
+ * fills in the value corresponding to the specified key. We overload the
+ * sequence field in the cn_msg header to define our KVP message types.
+--
+2.31.1
+
diff --git a/SOURCES/hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch b/SOURCES/hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch
new file mode 100644
index 0000000..0214b1c
--- /dev/null
+++ b/SOURCES/hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch
@@ -0,0 +1,53 @@
+From 07081e4a9622c042dec1e3c7ffd47722a6dc0337 Mon Sep 17 00:00:00 2001
+From: Mohammed Gamal <mgamal@redhat.com>
+Date: Thu, 17 Nov 2022 18:58:31 +0100
+Subject: [PATCH 3/3] tools: hv: kvp: remove unnecessary (void*) conversions
+
+RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-MergeRequest: 5: Update hyperv-daemons for RHEL-9.2
+RH-Bugzilla: 2139457
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [2/2] d3fe2884e899eab164e8b42398db72618b05ec71
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139457
+
+commit 2258954234db7530e9d86bb32cd6ad54485ff926
+Author: Zhou jie <zhoujie@nfschina.com>
+Date: Tue Aug 23 11:45:52 2022 +0800
+
+ tools: hv: kvp: remove unnecessary (void*) conversions
+
+ Remove unnecessary void* type casting.
+
+ Signed-off-by: Zhou jie <zhoujie@nfschina.com>
+ Reviewed-by: Michael Kelley <mikelley@microsoft.com>
+ Link: https://lore.kernel.org/r/20220823034552.8596-1-zhoujie@nfschina.com
+ Signed-off-by: Wei Liu <wei.liu@kernel.org>
+
+Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
+---
+ hv_kvp_daemon.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
+index 5f98bee..2ad9af3 100644
+--- a/hv_kvp_daemon.c
++++ b/hv_kvp_daemon.c
+@@ -772,11 +772,11 @@ static int kvp_process_ip_address(void *addrp,
+ const char *str;
+
+ if (family == AF_INET) {
+- addr = (struct sockaddr_in *)addrp;
++ addr = addrp;
+ str = inet_ntop(family, &addr->sin_addr, tmp, 50);
+ addr_length = INET_ADDRSTRLEN;
+ } else {
+- addr6 = (struct sockaddr_in6 *)addrp;
++ addr6 = addrp;
+ str = inet_ntop(family, &addr6->sin6_addr.s6_addr, tmp, 50);
+ addr_length = INET6_ADDRSTRLEN;
+ }
+--
+2.31.1
+
diff --git a/SPECS/hyperv-daemons.spec b/SPECS/hyperv-daemons.spec
index 928780c..e7c874c 100644
--- a/SPECS/hyperv-daemons.spec
+++ b/SPECS/hyperv-daemons.spec
@@ -13,7 +13,7 @@
Name: hyperv-daemons
Version: 0
-Release: 0.40%{?snapver}%{?dist}
+Release: 0.41%{?snapver}%{?dist}
Summary: Hyper-V daemons suite
License: GPLv2
@@ -52,6 +52,12 @@ Patch0006: 0006-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch
Patch7: hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch
# For bz#2026371 - [RHEL9][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update for RHEL9 since the ifdown/ifup was not supported on RHEL9
Patch8: hpvd-Use-filename-for-connection-profile.patch
+# For bz#2122115 - [Hyper-V][RHEL-9] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0
+Patch9: hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch
+# For bz#2139457 - [Hyper-V][RHEL9.2] Update Hyper-V-Daemons
+Patch10: hpvd-tools-hv-Remove-an-extraneous-the.patch
+# For bz#2139457 - [Hyper-V][RHEL9.2] Update Hyper-V-Daemons
+Patch11: hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch
# Source-git patches
@@ -159,6 +165,9 @@ cp -pvL %{SOURCE301} lsvmbus
%patch0006 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
%build
# HYPERV KVP DAEMON
@@ -276,6 +285,15 @@ fi
%{_sbindir}/vmbus_testing
%changelog
+* Mon Nov 21 2022 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.41.20190303git
+- hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch [bz#2122115]
+- hpvd-tools-hv-Remove-an-extraneous-the.patch [bz#2139457]
+- hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch [bz#2139457]
+- Resolves: bz#2122115
+ ([Hyper-V][RHEL-9] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0)
+- Resolves: bz#2139457
+ ([Hyper-V][RHEL9.2] Update Hyper-V-Daemons)
+
* Fri Jul 29 2022 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.40.20190303git
- hpvd-hypervkvpd.service-ordering-fixes.patch [bz#2103188]
- Resolves: bz#2103188