diff --git a/kernel/linux/efa/RELEASENOTES.md b/kernel/linux/efa/RELEASENOTES.md
index feee0510..59a2a655 100644
--- a/kernel/linux/efa/RELEASENOTES.md
+++ b/kernel/linux/efa/RELEASENOTES.md
@@ -3,6 +3,11 @@
 ## Supported Kernel Versions and Distributions
 https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html#efa-amis
 
+## r2.6.0 release notes
+* Fix wrong resources destruction order
+* Enable Nvidia GDR using P2P on up-to-date kernels
+* Expose accelerator memory P2P provider in sysfs
+
 ## r2.5.0 release notes
 * Add RDMA write statistics
 
diff --git a/kernel/linux/efa/conf/dkms.conf b/kernel/linux/efa/conf/dkms.conf
index 61bddd83..217189d2 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.5.0"
+PACKAGE_VERSION="2.6.0"
 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 623cc57e..4976bd0a 100644
--- a/kernel/linux/efa/debian/changelog
+++ b/kernel/linux/efa/debian/changelog
@@ -1,3 +1,10 @@
+efa (2.6.0-1.amzn1) unstable; urgency=medium
+  * Fix wrong resources destruction order
+  * Enable Nvidia GDR using P2P on up-to-date kernels
+  * Expose accelerator memory P2P provider in sysfs
+
+ -- Michael Margolin <mrgolin@amazon.com>  Thu, 09 Nov 2023 14:41:36 +0000
+
 efa (2.5.0-1.amzn1) unstable; urgency=medium
   * Add RDMA write statistics
 
diff --git a/kernel/linux/efa/debian/efa.postinst b/kernel/linux/efa/debian/efa.postinst
index 1e0c043b..f5f74185 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.5.0
+DRIVER_VERSION=2.6.0
 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 e8db3be2..b2f45623 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.5.0
+DRIVER_VERSION=2.6.0
 
 dkms remove -m ${NAME} -v ${DRIVER_VERSION} --all
 
diff --git a/kernel/linux/efa/debian/rules b/kernel/linux/efa/debian/rules
index 05044b0d..cd0c1705 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.5.0
+VERSION = 2.6.0
 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 e08df2de..f1486125 100644
--- a/kernel/linux/efa/rpm/Makefile
+++ b/kernel/linux/efa/rpm/Makefile
@@ -2,7 +2,7 @@
 
 NAME = efa
 SPEC = $(NAME).spec
-VERSION	= 2.5.0
+VERSION	= 2.6.0
 
 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 ad9a6c85..2f329cea 100644
--- a/kernel/linux/efa/rpm/efa.spec
+++ b/kernel/linux/efa/rpm/efa.spec
@@ -98,6 +98,11 @@ install -m 644 neuron_p2p.h		%{buildroot}%{install_path}/src
 /etc/modprobe.d/efa.conf
 
 %changelog
+* Thu Nov 09 2023 Michael Margolin <mrgolin@amazon.com> - 2.6.0
+- Fix wrong resources destruction order
+- Enable Nvidia GDR using P2P on up-to-date kernels
+- Expose accelerator memory P2P provider in sysfs
+
 * Tue Jul 11 2023 Michael Margolin <mrgolin@amazon.com> - 2.5.0
 - Add RDMA write statistics
 
diff --git a/kernel/linux/efa/src/efa_main.c b/kernel/linux/efa/src/efa_main.c
index 30bcade9..7eba2cdd 100644
--- a/kernel/linux/efa/src/efa_main.c
+++ b/kernel/linux/efa/src/efa_main.c
@@ -32,7 +32,7 @@ static const struct pci_device_id efa_pci_tbl[] = {
 };
 
 #define DRV_MODULE_VER_MAJOR           2
-#define DRV_MODULE_VER_MINOR           5
+#define DRV_MODULE_VER_MINOR           6
 #define DRV_MODULE_VER_SUBMINOR        0
 
 #ifndef DRV_MODULE_VERSION