- up to 4.0.6

diff --git a/kernel-libata-ahci-pm.patch b/kernel-libata-ahci-pm.patch
index e203d113689d378eb72d7d67521cfdc20cde6e73..2ad5bddde2b69c84574600051bb6660652454f2c 100644 (file)
--- a/kernel-libata-ahci-pm.patch
+++ b/kernel-libata-ahci-pm.patch
@@ -274,10 +274,10 @@ index 8dad4a3..31c149b 100644
  };
  
  /* Fields between ATA_DEVICE_CLEAR_BEGIN and ATA_DEVICE_CLEAR_END are
-@@ -788,6 +790,7 @@ struct ata_link {
-       struct ata_eh_context   eh_context;
- 
+@@ -800,6 +800,7 @@ struct ata_link {
        struct ata_device       device[ATA_MAX_DEVICES];
+ 
+       unsigned long           last_lpm_change; /* when last LPM change happened */
 +      u8                      init_lpm; /* initial lpm configuration */
  };
  #define ATA_LINK_CLEAR_BEGIN          offsetof(struct ata_link, active_tag)

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index b03299e6100bd5db95179ca57cb0aa27b56ffc68..28517b8ba73a02d99c71733dc738dde08270f500 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,49 +26,4 @@
                                exit
                        fi
                done
-From a81157768a00e8cf8a7b43b5ea5cac931262374f Mon Sep 17 00:00:00 2001
-From: Eric Work <work.eric@gmail.com>
-Date: Mon, 18 May 2015 23:26:23 -0700
-Subject: md/raid0: fix restore to sector variable in raid0_make_request
-
-The variable "sector" in "raid0_make_request()" was improperly updated
-by a call to "sector_div()" which modifies its first argument in place.
-Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable
-after the call for later re-use.  Unfortunetly the restore was done after
-the referenced variable "bio" was advanced.  This lead to the original
-value and the restored value being different.  Here we move this line to
-the proper place.
-
-One observed side effect of this bug was discarding a file though
-unlinking would cause an unrelated file's contents to be discarded.
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.")
-Cc: stable@vger.kernel.org (any that received above backport)
-URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501
-
-diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
-index 6a68ef5..efb654e 100644
---- a/drivers/md/raid0.c
-+++ b/drivers/md/raid0.c
-@@ -524,6 +524,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
-                        ? (sector & (chunk_sects-1))
-                        : sector_div(sector, chunk_sects));
- 
-+              /* Restore due to sector_div */
-+              sector = bio->bi_iter.bi_sector;
-+
-               if (sectors < bio_sectors(bio)) {
-                       split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set);
-                       bio_chain(split, bio);
-@@ -531,7 +534,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
-                       split = bio;
-               }
- 
--              sector = bio->bi_iter.bi_sector;
-               zone = find_zone(mddev->private, &sector);
-               tmp_dev = map_sector(mddev, zone, sector, &sector);
-               split->bi_bdev = tmp_dev->bdev;
--- 
-cgit v0.10.2
 

diff --git a/kernel.spec b/kernel.spec
index b3c4388f609d8cc4e386059313b0a5e50e403c2a..1ede4fde1d80eb28577d7e9b784ad245374eaa91 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,9 +69,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             2
+%define                rel             1
 %define                basever         4.0
-%define                postver         .4
+%define                postver         .6
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -120,7 +120,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: a86916bd12798220da9eb4a1eec3616d
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  30de8c55237264deee4d4fc60eee78fd
+# Patch0-md5:  8ad50a9bdcb3895f1e60acb971bd990b
 %endif
 Source1:       kernel.sysconfig