- up to 4.1.39

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index bdbca6dee6bbbeb3f31b4bb752c75c54c945f67b..cd518b285dee0352b5f30933b4dd04e341bb51c0 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -125,50 +125,6 @@ index 29531ec..65fbfb7 100644
        if (!mp->m_eofblocks_workqueue)
                goto out_destroy_log;
 
-From 8af8e1c22f9994bb1849c01d66c24fe23f9bc9a0 Mon Sep 17 00:00:00 2001
-From: Dave Carroll <david.carroll@microsemi.com>
-Date: Thu, 9 Feb 2017 11:04:47 -0700
-Subject: scsi: aacraid: Fix INTx/MSI-x issue with older controllers
-
-commit 78cbccd3bd68 ("aacraid: Fix for KDUMP driver hang")
-
-caused a problem on older controllers which do not support MSI-x (namely
-ASR3405,ASR3805). This patch conditionalizes the previous patch to
-controllers which support MSI-x
-
-Cc: <stable@vger.kernel.org> # v4.7+
-Fixes: 78cbccd3bd68 ("aacraid: Fix for KDUMP driver hang")
-Reported-by: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
-Signed-off-by: Dave Carroll <david.carroll@microsemi.com>
-Reviewed-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
----
- drivers/scsi/aacraid/comminit.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
-index 4f56b10..5b48bed 100644
---- a/drivers/scsi/aacraid/comminit.c
-+++ b/drivers/scsi/aacraid/comminit.c
-@@ -50,9 +50,13 @@ struct aac_common aac_config = {
- 
- static inline int aac_is_msix_mode(struct aac_dev *dev)
- {
--      u32 status;
-+      u32 status = 0;
- 
--      status = src_readl(dev, MUnit.OMR);
-+      if (dev->pdev->device == PMC_DEVICE_S6 ||
-+              dev->pdev->device == PMC_DEVICE_S7 ||
-+              dev->pdev->device == PMC_DEVICE_S8) {
-+              status = src_readl(dev, MUnit.OMR);
-+      }
-       return (status & AAC_INT_MODE_MSIX);
- }
- 
--- 
-cgit v0.12
-
 From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001
 From: Andrey Konovalov <andreyknvl@google.com>
 Date: Thu, 16 Feb 2017 17:22:46 +0100

diff --git a/kernel.spec b/kernel.spec
index 37b54616315db843f9349f28de61c63b6476d87d..eba55bbf92fec0445fbfad47db14dba9ca2d3a21 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             3
+%define                rel             1
 %define                basever         4.1
-%define                postver         .38
+%define                postver         .39
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -122,7 +122,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: fe9dc0f6729f36400ea81aa41d614c37
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  f580c73d28a19889d7c911dc7f7f8394
+# Patch0-md5:  899a9b178d49c145de7df9712aaafefc
 %endif
 Source1:       kernel.sysconfig