bump to 4.0.5-rt3-1

5 files changed, 19 insertions, 136 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a592968df805..717c12ddca54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 4.2.1
-# Thu Jun 11 08:27:23 UTC 2015
+# Fri Jun 12 16:40:09 UTC 2015
 pkgbase = linux-rt
-	pkgver = 4.0.4_rt1
-	pkgrel = 3
+	pkgver = 4.0.5_rt3
+	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = i686
 	arch = x86_64
@@ -15,32 +15,26 @@ pkgbase = linux-rt
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.0.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.0.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.4.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.4.sign
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.0/older/patch-4.0.4-rt1.patch.xz
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.0/older/patch-4.0.4-rt1.patch.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.5.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.5.sign
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.0/older/patch-4.0.5-rt3.patch.xz
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.0/older/patch-4.0.5-rt3.patch.sign
 	source = config
 	source = config.x86_64
 	source = linux-rt.preset
 	source = change-default-console-loglevel.patch
 	source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.patch
-	source = md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
-	source = i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch
-	source = fix-typo-in-intel-sst.patch
 	sha256sums = 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991
 	sha256sums = SKIP
-	sha256sums = c268985a82483fe75f0f397217208e262f85a356d1d9f34b9e22255e549d7ce9
+	sha256sums = 60b691210a9e412710e29eac6468d64b6c4d1efc53a6e22878dd51044001adf0
 	sha256sums = SKIP
-	sha256sums = d69e0a95e30acc679343593a0c9d8eb9caf874cc2a97ae599691aef4e5a589f7
+	sha256sums = 508e57f15acfcc0cb01163c8238fe2c85998cbe5d091b6c85c6e3d6a54cf6f7d
 	sha256sums = SKIP
 	sha256sums = 7db363fd3001c5235a6ec499310ecec6f552faa3c2872954ccbb9d02e6e8e817
 	sha256sums = cb290ad42aed7f297d90b112227af533e37cfeabbf8bff8a9df4674647b461ab
 	sha256sums = 2abb6e506e4a687723d6a6dc21703f5d2b42a8956fbc3313e3da2b03c718c80d
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 7a42d16108eb9a8eacadef3603527fa1beab857cc4db3bd228858488fb1f3fda
-	sha256sums = b8911ed02e9f463bdff9dfe0dde84f0b3a9650aa989a5e9a6c4fad67a0ce19c9
-	sha256sums = 396e6adf67143770881d0609633e40a8bf3e462ca6e539773466a561940d84d8
-	sha256sums = a2bb8b48f0ddcd432f2ac62bef731357c29d106f2d32efa92ef571476d722216
 
 pkgname = linux-rt
 	pkgdesc = The Linux-rt kernel and modules
@@ -49,20 +43,20 @@ pkgname = linux-rt
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = kernel26-rt=4.0.4
+	provides = kernel26-rt=4.0.5
 	conflicts = kernel26-rt
 	replaces = kernel26-rt
 	backup = etc/mkinitcpio.d/linux-rt.preset
 
 pkgname = linux-rt-headers
 	pkgdesc = Header files and scripts for building modules for Linux-rt kernel
-	provides = kernel26-rt-headers=4.0.4
+	provides = kernel26-rt-headers=4.0.5
 	conflicts = kernel26-rt-headers
 	replaces = kernel26-rt-headers
 
 pkgname = linux-rt-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-rt kernel
-	provides = kernel26-rt-docs=4.0.4
+	provides = kernel26-rt-docs=4.0.5
 	conflicts = kernel26-rt-docs
 	replaces = kernel26-rt-docs
 
diff --git a/PKGBUILD b/PKGBUILD
index f95288873ddd..048e0cd1df63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,10 +8,10 @@
 #pkgbase=linux               # Build stock -ARCH kernel
 pkgbase=linux-rt             # Build kernel with a different name
 _srcname=linux-4.0
-_pkgver=4.0.4
-_rtpatchver=rt1
+_pkgver=4.0.5
+_rtpatchver=rt3
 pkgver=${_pkgver}_${_rtpatchver}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -25,25 +25,19 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar."{xz,sign}
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'change-default-console-loglevel.patch'
-        'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.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')
+        'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.patch')
 
 sha256sums=('0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991'
             'SKIP'
-            'c268985a82483fe75f0f397217208e262f85a356d1d9f34b9e22255e549d7ce9'
+            '60b691210a9e412710e29eac6468d64b6c4d1efc53a6e22878dd51044001adf0'
             'SKIP'
-            'd69e0a95e30acc679343593a0c9d8eb9caf874cc2a97ae599691aef4e5a589f7'
+            '508e57f15acfcc0cb01163c8238fe2c85998cbe5d091b6c85c6e3d6a54cf6f7d'
             'SKIP'
             '7db363fd3001c5235a6ec499310ecec6f552faa3c2872954ccbb9d02e6e8e817'
             'cb290ad42aed7f297d90b112227af533e37cfeabbf8bff8a9df4674647b461ab'
             '2abb6e506e4a687723d6a6dc21703f5d2b42a8956fbc3313e3da2b03c718c80d'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '7a42d16108eb9a8eacadef3603527fa1beab857cc4db3bd228858488fb1f3fda'
-            'b8911ed02e9f463bdff9dfe0dde84f0b3a9650aa989a5e9a6c4fad67a0ce19c9'
-            '396e6adf67143770881d0609633e40a8bf3e462ca6e539773466a561940d84d8'
-            'a2bb8b48f0ddcd432f2ac62bef731357c29d106f2d32efa92ef571476d722216')
+            '7a42d16108eb9a8eacadef3603527fa1beab857cc4db3bd228858488fb1f3fda')
 
 validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -76,18 +70,6 @@ prepare() {
   msg "fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.patch"
   patch -p1 -i "${srcdir}/fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.patch"
 
-  # Fix a problem with raid0
-  msg "md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch"
-  patch -p1 -i "${srcdir}/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch"
-
-  # stop a bogus WARN_ON with i915
-  msg "applying i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch"
-  patch -p1 -i "${srcdir}/i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch"
-
-  # fix a typo in soc/intel/sst//sst.c
-  msg "applying fix-typo-in-intel-sst.patch"
-  patch -p1 -i "${srcdir}/fix-typo-in-intel-sst.patch"
-
   msg "All patches have successfully been applied"
 
   if [ "${CARCH}" = "x86_64" ]; then
diff --git a/fix-typo-in-intel-sst.patch b/fix-typo-in-intel-sst.patch
deleted file mode 100644
index 894a0b963410..000000000000
--- a/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/i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch b/i915-bogus-warning-from-i915-when-running-on-PREEMPT_RT.patch
deleted file mode 100644
index 9d0fe86ccb3d..000000000000
--- a/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/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch b/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
deleted file mode 100644
index 98786e0276f0..000000000000
--- a/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