diff --git a/kernel/linux/efa/RELEASENOTES.md b/kernel/linux/efa/RELEASENOTES.md
index 47da911e..0e487968 100644
--- a/kernel/linux/efa/RELEASENOTES.md
+++ b/kernel/linux/efa/RELEASENOTES.md
@@ -3,6 +3,9 @@
 ## Supported Kernel Versions and Distributions
 https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html#efa-amis
 
+## r2.12.1 release notes
+* Fix RNR configuration for SRD kernel QPs
+
 ## r2.12.0 release notes
 * Introduce EFA kernel verbs support
 * Add 0xefa3 device support
diff --git a/kernel/linux/efa/conf/dkms.conf b/kernel/linux/efa/conf/dkms.conf
index 15103a05..d9413235 100644
--- a/kernel/linux/efa/conf/dkms.conf
+++ b/kernel/linux/efa/conf/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="efa"
-PACKAGE_VERSION="2.12.0"
+PACKAGE_VERSION="2.12.1"
 CLEAN="cd build; make modules_clean; make clean"
 PRE_BUILD="./configure-dkms.sh $kernelver $source_tree"
 # Quoted 'make' to suppress DKMS append of KERNELRELEASE
diff --git a/kernel/linux/efa/debian/changelog b/kernel/linux/efa/debian/changelog
index 003f2ab5..04643769 100644
--- a/kernel/linux/efa/debian/changelog
+++ b/kernel/linux/efa/debian/changelog
@@ -1,3 +1,8 @@
+efa (2.12.1-1.amzn1) unstable; urgency=medium
+  * Fix RNR configuration for SRD kernel QPs
+
+ -- Michael Margolin <mrgolin@amazon.com>  Sun, 06 Oct 2024 16:13:23 +0000
+
 efa (2.12.0-1.amzn1) unstable; urgency=medium
   * Introduce EFA kernel verbs support
   * Add 0xefa3 device support
diff --git a/kernel/linux/efa/debian/efa.postinst b/kernel/linux/efa/debian/efa.postinst
index f658ed17..3adf1b3c 100644
--- a/kernel/linux/efa/debian/efa.postinst
+++ b/kernel/linux/efa/debian/efa.postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=efa
-DRIVER_VERSION=2.12.0
+DRIVER_VERSION=2.12.1
 INSTALL_PATH=/usr/src/${NAME}-${DRIVER_VERSION}
 
 cd $INSTALL_PATH
diff --git a/kernel/linux/efa/debian/efa.prerm b/kernel/linux/efa/debian/efa.prerm
index f0e44257..af329a01 100644
--- a/kernel/linux/efa/debian/efa.prerm
+++ b/kernel/linux/efa/debian/efa.prerm
@@ -3,7 +3,7 @@
 set -e
 
 NAME=efa
-DRIVER_VERSION=2.12.0
+DRIVER_VERSION=2.12.1
 
 dkms remove -m ${NAME} -v ${DRIVER_VERSION} --all
 
diff --git a/kernel/linux/efa/debian/rules b/kernel/linux/efa/debian/rules
index 46975660..07d442f6 100755
--- a/kernel/linux/efa/debian/rules
+++ b/kernel/linux/efa/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/dpkg/pkg-info.mk
 export DH_VERBOSE = 1
 
 NAME	= efa
-VERSION = 2.12.0
+VERSION = 2.12.1
 DESTDIR:=`pwd`/debian/${NAME}
 INSTALL_PATH = /usr/src/${NAME}-${VERSION}
 
diff --git a/kernel/linux/efa/rpm/Makefile b/kernel/linux/efa/rpm/Makefile
index 810252ac..70f3cf51 100644
--- a/kernel/linux/efa/rpm/Makefile
+++ b/kernel/linux/efa/rpm/Makefile
@@ -2,7 +2,7 @@
 
 NAME = efa
 SPEC = $(NAME).spec
-VERSION	= 2.12.0
+VERSION	= 2.12.1
 
 TOPDIR  := $(shell git rev-parse --show-toplevel)
 TAG	?= HEAD
diff --git a/kernel/linux/efa/rpm/efa.spec b/kernel/linux/efa/rpm/efa.spec
index b8fb32a0..7c618e63 100644
--- a/kernel/linux/efa/rpm/efa.spec
+++ b/kernel/linux/efa/rpm/efa.spec
@@ -100,6 +100,9 @@ install -m 644 neuron_p2p.h		%{buildroot}%{install_path}/src
 /etc/modprobe.d/efa.conf
 
 %changelog
+* Sun Oct 06 2024 Michael Margolin <mrgolin@amazon.com> - 2.12.1
+- Fix RNR configuration for SRD kernel QPs
+
 * Tue Oct 01 2024 Michael Margolin <mrgolin@amazon.com> - 2.12.0
 - Introduce EFA kernel verbs support
 - Add 0xefa3 device support
diff --git a/kernel/linux/efa/src/efa_main.c b/kernel/linux/efa/src/efa_main.c
index f508db0f..aec1e2bf 100644
--- a/kernel/linux/efa/src/efa_main.c
+++ b/kernel/linux/efa/src/efa_main.c
@@ -39,7 +39,7 @@ static const struct pci_device_id efa_pci_tbl[] = {
 
 #define DRV_MODULE_VER_MAJOR           2
 #define DRV_MODULE_VER_MINOR           12
-#define DRV_MODULE_VER_SUBMINOR        0
+#define DRV_MODULE_VER_SUBMINOR        1
 
 #ifndef DRV_MODULE_VERSION
 #define DRV_MODULE_VERSION \