From 833b658c6bcdbb498103820fd2cdf090593bca32 Mon Sep 17 00:00:00 2001
From: Firas Jahjah <firasj@amazon.com>
Date: Sun, 17 Oct 2021 22:16:46 +0300
Subject: [PATCH] linux/efa: Bump driver version to 1.14.2

Reviewed-by: Yossi Leybovich <sleybo@amazon.com>
Signed-off-by: Firas Jahjah <firasj@amazon.com>
---
 kernel/linux/efa/RELEASENOTES.md     | 3 +++
 kernel/linux/efa/conf/dkms.conf      | 2 +-
 kernel/linux/efa/debian/changelog    | 5 +++++
 kernel/linux/efa/debian/efa.postinst | 2 +-
 kernel/linux/efa/debian/efa.prerm    | 2 +-
 kernel/linux/efa/debian/rules        | 2 +-
 kernel/linux/efa/rpm/Makefile        | 2 +-
 kernel/linux/efa/rpm/efa.spec        | 3 +++
 kernel/linux/efa/src/efa_main.c      | 2 +-
 9 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/kernel/linux/efa/RELEASENOTES.md b/kernel/linux/efa/RELEASENOTES.md
index ab43edd3..beec017e 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
 
+## r1.14.2 release notes
+* Various GDR fixes
+
 ## r1.14.1 release notes
 * Make gdr sysfs return zero in case nvidia symbols are not available
 
diff --git a/kernel/linux/efa/conf/dkms.conf b/kernel/linux/efa/conf/dkms.conf
index 2db61612..75577733 100644
--- a/kernel/linux/efa/conf/dkms.conf
+++ b/kernel/linux/efa/conf/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="efa"
-PACKAGE_VERSION="1.14.1"
+PACKAGE_VERSION="1.14.2"
 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 fb338a65..ad256468 100644
--- a/kernel/linux/efa/debian/changelog
+++ b/kernel/linux/efa/debian/changelog
@@ -1,3 +1,8 @@
+efa (1.14.2-1.amzn1) unstable; urgency=medium
+  * Various GDR fixes
+
+ -- Firas Jahjah <firasj@amazon.com>  Sun, 17 Oct 2021 22:16:33 +0000
+
 efa (1.14.1-1.amzn1) unstable; urgency=medium
   * Make gdr sysfs return zero in case nvidia symbols are not available
 
diff --git a/kernel/linux/efa/debian/efa.postinst b/kernel/linux/efa/debian/efa.postinst
index 3315e219..02b7cfde 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=1.14.1
+DRIVER_VERSION=1.14.2
 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 3378877c..dc6e2668 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=1.14.1
+DRIVER_VERSION=1.14.2
 
 dkms remove -m ${NAME} -v ${DRIVER_VERSION} --all
 
diff --git a/kernel/linux/efa/debian/rules b/kernel/linux/efa/debian/rules
index 05a295b6..cbc39222 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 = 1.14.1
+VERSION = 1.14.2
 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 c5bdbbd4..0140bcaa 100644
--- a/kernel/linux/efa/rpm/Makefile
+++ b/kernel/linux/efa/rpm/Makefile
@@ -2,7 +2,7 @@
 
 NAME = efa
 SPEC = $(NAME).spec
-VERSION	= 1.14.1
+VERSION	= 1.14.2
 
 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 0a03b58f..37ab8e06 100644
--- a/kernel/linux/efa/rpm/efa.spec
+++ b/kernel/linux/efa/rpm/efa.spec
@@ -94,6 +94,9 @@ install -m 644 nv-p2p.h			%{buildroot}%{install_path}/src
 /etc/modprobe.d/efa.conf
 
 %changelog
+* Sun Oct 17 2021 Firas Jahjah <firasj@amazon.com> - 1.14.2
+- Various GDR fixes
+
 * Thu Sep 23 2021 Firas Jahjah <firasj@amazon.com> - 1.14.1
 - Make gdr sysfs return zero in case nvidia symbols are not available
 
diff --git a/kernel/linux/efa/src/efa_main.c b/kernel/linux/efa/src/efa_main.c
index 1d1b94e8..7b6c0866 100644
--- a/kernel/linux/efa/src/efa_main.c
+++ b/kernel/linux/efa/src/efa_main.c
@@ -31,7 +31,7 @@ static const struct pci_device_id efa_pci_tbl[] = {
 
 #define DRV_MODULE_VER_MAJOR           1
 #define DRV_MODULE_VER_MINOR           14
-#define DRV_MODULE_VER_SUBMINOR        1
+#define DRV_MODULE_VER_SUBMINOR        2
 
 #ifndef DRV_MODULE_VERSION
 #define DRV_MODULE_VERSION \