diff --git a/patches.kernel.org/6.2.12-036-RDMA-erdma-Fix-some-typos.patch b/patches.kernel.org/6.2.12-036-RDMA-erdma-Fix-some-typos.patch
new file mode 100644
index 0000000..76a21ff
--- /dev/null
+++ b/patches.kernel.org/6.2.12-036-RDMA-erdma-Fix-some-typos.patch
@@ -0,0 +1,65 @@
+From: Cheng Xu <chengyou@linux.alibaba.com>
+Date: Mon, 20 Mar 2023 16:46:49 +0800
+Subject: [PATCH] RDMA/erdma: Fix some typos
+References: bsc#1012628
+Patch-mainline: 6.2.12
+Git-commit: 3fe26c0493e4c2da4b7d8ba8c975a6f48fb75ec2
+
+[ Upstream commit 3fe26c0493e4c2da4b7d8ba8c975a6f48fb75ec2 ]
+
+FAA is short for atomic fetch and add, not FAD. Fix this.
+
+Fixes: 0ca9c2e2844a ("RDMA/erdma: Implement atomic operations support")
+Signed-off-by: Cheng Xu <chengyou@linux.alibaba.com>
+Link: https://lore.kernel.org/r/20230320084652.16807-2-chengyou@linux.alibaba.com
+Signed-off-by: Leon Romanovsky <leon@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/infiniband/hw/erdma/erdma_cq.c | 2 +-
+ drivers/infiniband/hw/erdma/erdma_hw.h | 2 +-
+ drivers/infiniband/hw/erdma/erdma_qp.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/infiniband/hw/erdma/erdma_cq.c b/drivers/infiniband/hw/erdma/erdma_cq.c
+index cabd8678..7bc35427 100644
+--- a/drivers/infiniband/hw/erdma/erdma_cq.c
++++ b/drivers/infiniband/hw/erdma/erdma_cq.c
+@@ -65,7 +65,7 @@ static const enum ib_wc_opcode wc_mapping_table[ERDMA_NUM_OPCODES] = {
+ 	[ERDMA_OP_LOCAL_INV] = IB_WC_LOCAL_INV,
+ 	[ERDMA_OP_READ_WITH_INV] = IB_WC_RDMA_READ,
+ 	[ERDMA_OP_ATOMIC_CAS] = IB_WC_COMP_SWAP,
+-	[ERDMA_OP_ATOMIC_FAD] = IB_WC_FETCH_ADD,
++	[ERDMA_OP_ATOMIC_FAA] = IB_WC_FETCH_ADD,
+ };
+ 
+ static const struct {
+diff --git a/drivers/infiniband/hw/erdma/erdma_hw.h b/drivers/infiniband/hw/erdma/erdma_hw.h
+index ab371fec..cbeb6909 100644
+--- a/drivers/infiniband/hw/erdma/erdma_hw.h
++++ b/drivers/infiniband/hw/erdma/erdma_hw.h
+@@ -491,7 +491,7 @@ enum erdma_opcode {
+ 	ERDMA_OP_LOCAL_INV = 15,
+ 	ERDMA_OP_READ_WITH_INV = 16,
+ 	ERDMA_OP_ATOMIC_CAS = 17,
+-	ERDMA_OP_ATOMIC_FAD = 18,
++	ERDMA_OP_ATOMIC_FAA = 18,
+ 	ERDMA_NUM_OPCODES = 19,
+ 	ERDMA_OP_INVALID = ERDMA_NUM_OPCODES + 1
+ };
+diff --git a/drivers/infiniband/hw/erdma/erdma_qp.c b/drivers/infiniband/hw/erdma/erdma_qp.c
+index d088d6be..ff473b20 100644
+--- a/drivers/infiniband/hw/erdma/erdma_qp.c
++++ b/drivers/infiniband/hw/erdma/erdma_qp.c
+@@ -439,7 +439,7 @@ static int erdma_push_one_sqe(struct erdma_qp *qp, u16 *pi,
+ 				cpu_to_le64(atomic_wr(send_wr)->compare_add);
+ 		} else {
+ 			wqe_hdr |= FIELD_PREP(ERDMA_SQE_HDR_OPCODE_MASK,
+-					      ERDMA_OP_ATOMIC_FAD);
++					      ERDMA_OP_ATOMIC_FAA);
+ 			atomic_sqe->fetchadd_swap_data =
+ 				cpu_to_le64(atomic_wr(send_wr)->compare_add);
+ 		}
+-- 
+2.35.3
+
diff --git a/series.conf b/series.conf
index f915bcc..0965224 100644
--- a/series.conf
+++ b/series.conf
@@ -2263,6 +2263,7 @@
 	patches.kernel.org/6.2.12-033-RDMA-irdma-Increase-iWARP-CM-default-rexmit-co.patch
 	patches.kernel.org/6.2.12-034-RDMA-irdma-Add-ipv4-check-to-irdma_find_listen.patch
 	patches.kernel.org/6.2.12-035-IB-mlx5-Add-support-for-400G_8X-lane-speed.patch
+	patches.kernel.org/6.2.12-036-RDMA-erdma-Fix-some-typos.patch
 
 	########################################################
 	# Build fixes that apply to the vanilla kernel too.