linux-libre-rt-4.0.5_gnu.rt4-1: updating version

4 files changed, 5 insertions, 113 deletions

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 73ac151f6..e0b9b307d 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -12,9 +12,9 @@
 
 pkgbase=linux-libre-rt      # Build stock -rt kernel
 _pkgbasever=4.0-gnu
-_pkgver=4.0.4-gnu
+_pkgver=4.0.5-gnu
 _rtbasever=4.0
-_rtpatchver=rt1
+_rtpatchver=rt4
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -23,7 +23,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}_${_rtpatchver}
 pkgver=${_pkgver//-/_}.${_rtpatchver}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="https://rt.wiki.kernel.org/"
 license=('GPL2')
@@ -46,17 +46,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
-        'md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch'
-        'i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch'
-        'fix-typo-in-intel-sst.patch'
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
         "https://repo.parabola.nu/other/linux-libre/patches/4.0.2-ae91f13af5-loongson-community.patch"
         "https://repo.parabola.nu/other/linux-libre/patches/4.0.2-ae91f13af5-loongson-community.patch.sig")
 sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a'
             'SKIP'
-            'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61'
+            '5ac82d1955fee5abccda157ef2399b34d4fd1c2310a33d19c09ca5953b308172'
             'SKIP'
-            'd69e0a95e30acc679343593a0c9d8eb9caf874cc2a97ae599691aef4e5a589f7'
+            '9503166ca9cfc71b3d05d3c86a650a42f730f28d62eb04e77443d67a70f5d2df'
             'SKIP'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             'SKIP'
@@ -69,9 +66,6 @@ sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a'
             '5bf34aee37178508394885b9b8f870c5ace955aca18f3d5ccc25fea876d8b334'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            'b8911ed02e9f463bdff9dfe0dde84f0b3a9650aa989a5e9a6c4fad67a0ce19c9'
-            '396e6adf67143770881d0609633e40a8bf3e462ca6e539773466a561940d84d8'
-            'a2bb8b48f0ddcd432f2ac62bef731357c29d106f2d32efa92ef571476d722216'
             '13e141279af2bc17decfc041e015710daac9a6cd1c9b4e871a76cb8f916b9e22'
             'SKIP')
 validpgpkeys=(
@@ -116,15 +110,6 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # https://bugzilla.kernel.org/show_bug.cgi?id=98501
-  patch -Np1 -i "${srcdir}/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch"
-
-  # stop a bogus WARN_ON with i915
-  patch -p1 -i "${srcdir}/i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch"
-
-  # fix a typo in soc/intel/sst/sst.c
-  patch -p1 -i "${srcdir}/fix-typo-in-intel-sst.patch"
-
   # Adding loongson-community patch
   if [ "${CARCH}" == "mips64el" ]; then
     patch -p1 -i ${srcdir}/4.0.2-ae91f13af5-loongson-community.patch
diff --git a/kernels/linux-libre-rt/fix-typo-in-intel-sst.patch b/kernels/linux-libre-rt/fix-typo-in-intel-sst.patch
deleted file mode 100644
index 894a0b963..000000000
--- a/kernels/linux-libre-rt/fix-typo-in-intel-sst.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- linux-4.0/sound/soc/intel/sst/sst.c~	2015-04-12 15:12:50.000000000 -0700
-+++ linux-4.0/sound/soc/intel/sst/sst.c	2015-05-23 21:51:46.000000000 -0700
-@@ -368,8 +368,8 @@
- 	 * initialize by FW or driver when firmware is loaded
- 	 */
- 	spin_lock_irqsave(&ctx->ipc_spin_lock, irq_flags);
--	sst_shim_write64(shim, SST_IMRX, shim_regs->imrx),
--	sst_shim_write64(shim, SST_CSR, shim_regs->csr),
-+	sst_shim_write64(shim, SST_IMRX, shim_regs->imrx);
-+	sst_shim_write64(shim, SST_CSR, shim_regs->csr);
- 	spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags);
- }
-
diff --git a/kernels/linux-libre-rt/i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch b/kernels/linux-libre-rt/i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch
deleted file mode 100644
index 9d0fe86cc..000000000
--- a/kernels/linux-libre-rt/i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Clark Williams <williams@redhat.com>
-Date: Thu, 21 May 2015 12:51:53 -0500
-Subject: [PATCH] [rt] i915: bogus warning from i915 when running on PREEMPT_RT
-
-The i915 driver has a 'WARN_ON(!in_interrupt())' in the display
-handler, which whines constanly on the RT kernel (since the interrupt
-is actually handled in a threaded handler and not actual interrupt
-context).
-
-Change the WARN_ON to WARN_ON_NORT
-
-Signed-off-by: Clark Williams <williams@redhat.com>
----
- drivers/gpu/drm/i915/intel_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index f75173c20f47..30b1d16caa0d 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -9745,7 +9745,7 @@ void intel_check_page_flip(struct drm_device *dev, int pipe)
- 	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
- 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- 
--	WARN_ON(!in_interrupt());
-+	WARN_ON_NONRT(!in_interrupt());
- 
- 	if (crtc == NULL)
- 		return;
--- 
-2.1.0
diff --git a/kernels/linux-libre-rt/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch b/kernels/linux-libre-rt/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
deleted file mode 100644
index 98786e027..000000000
--- a/kernels/linux-libre-rt/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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: [PATCH] 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
----
- drivers/md/raid0.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-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;
--- 
-2.4.1