From 7fffc36464e84ef189e95fe2e25f76617d2c6589 Mon Sep 17 00:00:00 2001
From: Gal Pressman <galpress@amazon.com>
Date: Thu, 8 Aug 2019 11:20:45 +0300
Subject: [PATCH] linux/efa: Bump driver version to 1.3.1

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

diff --git a/kernel/linux/efa/RELEASENOTES.md b/kernel/linux/efa/RELEASENOTES.md
index f04ae724..31e184dc 100644
--- a/kernel/linux/efa/RELEASENOTES.md
+++ b/kernel/linux/efa/RELEASENOTES.md
@@ -13,6 +13,11 @@ The driver was tested on the following distributions:
 * CentOS 7.4
 * CentOS 7.6
 
+## r1.3.1 release notes
+
+* Fix build issue in debian/rules file
+* Fix kcompat issue (usage before include)
+
 ## r1.3.0 release notes
 
 * Align to the driver that was merged upstream
diff --git a/kernel/linux/efa/conf/dkms.conf b/kernel/linux/efa/conf/dkms.conf
index 67865af8..11030476 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.3.0"
+PACKAGE_VERSION="1.3.1"
 CLEAN="make clean"
 MAKE="make KERNEL_VERSION=${kernelver}"
 BUILT_MODULE_NAME[0]="efa"
diff --git a/kernel/linux/efa/debian/changelog b/kernel/linux/efa/debian/changelog
index e5aca32e..03c39faa 100644
--- a/kernel/linux/efa/debian/changelog
+++ b/kernel/linux/efa/debian/changelog
@@ -1,3 +1,10 @@
+efa (1.3.1-1.amzn1) unstable; urgency=medium
+
+  * Fix build issue in debian/rules file
+  * Fix kcompat issue (usage before include)
+
+ -- Gal Pressman <galpress@amazon.com>  Thu, 8 Aug 2019 11:19:27 +0000
+
 efa (1.3.0-1.amzn1) unstable; urgency=medium
 
   * Align to the driver that was merged upstream
diff --git a/kernel/linux/efa/debian/efa.postinst b/kernel/linux/efa/debian/efa.postinst
index aab68725..8004e77a 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.3.0
+DRIVER_VERSION=1.3.1
 
 dkms add -m ${NAME} -v ${DRIVER_VERSION}
 for kernel in $(/bin/ls /lib/modules); do
diff --git a/kernel/linux/efa/debian/efa.prerm b/kernel/linux/efa/debian/efa.prerm
index a5b0e07c..f8f7988c 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.3.0
+DRIVER_VERSION=1.3.1
 
 dkms remove -m ${NAME} -v ${DRIVER_VERSION} --all
 
diff --git a/kernel/linux/efa/debian/rules b/kernel/linux/efa/debian/rules
index 88b21046..b16e4276 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.3.0
+VERSION = 1.3.1
 DESTDIR:=`pwd`/debian/${NAME}
 INSTALL_PATH = /usr/src/${NAME}-${VERSION}
 
diff --git a/kernel/linux/efa/efa_main.c b/kernel/linux/efa/efa_main.c
index 4dfdf638..44aa8854 100644
--- a/kernel/linux/efa/efa_main.c
+++ b/kernel/linux/efa/efa_main.c
@@ -23,7 +23,7 @@ static const struct pci_device_id efa_pci_tbl[] = {
 
 #define DRV_MODULE_VER_MAJOR           1
 #define DRV_MODULE_VER_MINOR           3
-#define DRV_MODULE_VER_SUBMINOR        0
+#define DRV_MODULE_VER_SUBMINOR        1
 
 #ifndef DRV_MODULE_VERSION
 #define DRV_MODULE_VERSION \
diff --git a/kernel/linux/efa/rpm/Makefile b/kernel/linux/efa/rpm/Makefile
index a977656a..c250ebd2 100644
--- a/kernel/linux/efa/rpm/Makefile
+++ b/kernel/linux/efa/rpm/Makefile
@@ -1,7 +1,7 @@
 # Makefile for creating rpm of the Amazon EFA driver
 
 NAME	= efa
-VERSION	= 1.3.0
+VERSION	= 1.3.1
 
 TOPDIR  := $(shell git rev-parse --show-toplevel)
 TAG	= master
diff --git a/kernel/linux/efa/rpm/efa.spec b/kernel/linux/efa/rpm/efa.spec
index e49d630b..1b87563c 100644
--- a/kernel/linux/efa/rpm/efa.spec
+++ b/kernel/linux/efa/rpm/efa.spec
@@ -66,6 +66,10 @@ install -m 644 RELEASENOTES.md		%{buildroot}%{install_path}
 /etc/modprobe.d/efa.conf
 
 %changelog
+* Thu Aug 8 2019 Gal Pressman <galpress@amazon.com> - 1.3.1
+- Fix build issue in debian/rules file
+- Fix kcompat issue (usage before include)
+
 * Sun Jul 7 2019 Gal Pressman <galpress@amazon.com> - 1.3.0
 - Align to the driver that was merged upstream
 - Fix a bug where failed functions would return success return value