bump to 4.4.50_rt63-1

3 files changed, 15 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59e13b1da04a..d346841a83cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.0.1
-# Sat Feb 25 20:30:20 UTC 2017
+# Sun Mar 12 13:26:40 UTC 2017
 pkgbase = linux-rt-lts
-	pkgver = 4.4.47_rt59
-	pkgrel = 2
+	pkgver = 4.4.50_rt63
+	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = i686
 	arch = x86_64
@@ -15,17 +15,16 @@ pkgbase = linux-rt-lts
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.47.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.47.sign
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.47-rt59.patch.xz
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.47-rt59.patch.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.50.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.50.sign
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.50-rt63.patch.xz
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.50-rt63.patch.sign
 	source = config
 	source = config.x86_64
 	source = 99-linux.hook
 	source = linux-rt-lts.preset
 	source = change-default-console-loglevel.patch
 	source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch
-	source = 0001-fix-rt_mutex.patch
 	source = 0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
@@ -34,9 +33,9 @@ pkgbase = linux-rt-lts
 	validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14
 	sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
 	sha256sums = SKIP
-	sha256sums = 21fd72caa322800b4668b4464d6ac4d8d66faa0056e08a5925d5911dab438c18
+	sha256sums = c5756a4b7290092d875967c310b684dbd91cb57438a25a3603bce6b1d0f19b36
 	sha256sums = SKIP
-	sha256sums = 6ad926f1370aec5084f8b63e08e38a46672f534828d478c21e4993c0074b528e
+	sha256sums = f6f5af2f790cdbe16bb5d1dc59521f3c01e235c9107dd180a3b0d38dfbc7a19a
 	sha256sums = SKIP
 	sha256sums = 1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191
 	sha256sums = b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3
@@ -44,7 +43,6 @@ pkgbase = linux-rt-lts
 	sha256sums = a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06
-	sha256sums = 785960e97b6054274814a2354f84ccd64c0c01485761d3a3a82a4458bd7ad021
 	sha256sums = ab22d941388440ee7da44535305f535cb5a2abc4151289757f5753b13ebd78e8
 
 pkgname = linux-rt-lts
diff --git a/0001-fix-rt_mutex.patch b/0001-fix-rt_mutex.patch
deleted file mode 100644
index 1f3a1f629629..000000000000
--- a/0001-fix-rt_mutex.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 93f3bd72784ed58cbba1a32b043a842f205a631f Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Date: Fri, 10 Feb 2017 18:21:04 +0100
-Subject: rt: Drop mutex_disable() on !DEBUG configs and the GPL suffix from
- export symbol
-
-Alex Goins reported that mutex_destroy() on RT will force a GPL only symbol
-which won't link and therefore fail on a non-GPL kernel module.
-This does not happen on !RT and is a regression on RT which we would like to
-avoid.
-I try here the easy thing and to not use rt_mutex_destroy() if
-CONFIG_DEBUG_MUTEXES is not enabled. This will still break for the DEBUG
-configs so instead of adding a wrapper around rt_mutex_destroy() (which we have
-for rt_mutex_lock() for instance) I am simply dropping the GPL part from the
-export.
-
-Reported-by: Alex Goins <agoins@nvidia.com>
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
----
- include/linux/mutex_rt.h | 5 +++++
- kernel/locking/rtmutex.c | 3 +--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/include/linux/mutex_rt.h b/include/linux/mutex_rt.h
-index c38a44b..e0284ed 100644
---- a/include/linux/mutex_rt.h
-+++ b/include/linux/mutex_rt.h
-@@ -43,7 +43,12 @@ extern void __lockfunc _mutex_unlock(struct mutex *lock);
- #define mutex_lock_killable(l)		_mutex_lock_killable(l)
- #define mutex_trylock(l)		_mutex_trylock(l)
- #define mutex_unlock(l)			_mutex_unlock(l)
-+
-+#ifdef CONFIG_DEBUG_MUTEXES
- #define mutex_destroy(l)		rt_mutex_destroy(&(l)->lock)
-+#else
-+static inline void mutex_destroy(struct mutex *lock) {}
-+#endif
- 
- #ifdef CONFIG_DEBUG_LOCK_ALLOC
- # define mutex_lock_nested(l, s)	_mutex_lock_nested(l, s)
--- 
-cgit v0.12
diff --git a/PKGBUILD b/PKGBUILD
index 2028eb4bb570..b5995bfaf9df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,10 @@
 #pkgbase=linux               # Build stock -ARCH kernel
 pkgbase=linux-rt-lts         # Build kernel with a different name
 _srcname=linux-4.4
-_pkgver=4.4.47
-_rtpatchver=rt59
+_pkgver=4.4.50
+_rtpatchver=rt63
 pkgver=${_pkgver}_${_rtpatchver}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://www.kernel.org/"
 license=('GPL2')
@@ -30,15 +30,14 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         "${pkgbase}.preset"
         'change-default-console-loglevel.patch'
         'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch'
-        '0001-fix-rt_mutex.patch'
         '0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch'
         )
 
 sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
             'SKIP'
-            '21fd72caa322800b4668b4464d6ac4d8d66faa0056e08a5925d5911dab438c18'
+            'c5756a4b7290092d875967c310b684dbd91cb57438a25a3603bce6b1d0f19b36'
             'SKIP'
-            '6ad926f1370aec5084f8b63e08e38a46672f534828d478c21e4993c0074b528e'
+            'f6f5af2f790cdbe16bb5d1dc59521f3c01e235c9107dd180a3b0d38dfbc7a19a'
             'SKIP'
             '1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191'
             'b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3'
@@ -46,7 +45,6 @@ sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
             'a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06'
-            '785960e97b6054274814a2354f84ccd64c0c01485761d3a3a82a4458bd7ad021'
             'ab22d941388440ee7da44535305f535cb5a2abc4151289757f5753b13ebd78e8')
 
 validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -81,11 +79,7 @@ prepare() {
   msg "fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch"
   patch -p1 -i "${srcdir}/fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch"
 
-  msg "0001-fix-rt_mutex.patch"
-  patch -p1 -i "${srcdir}/0001-fix-rt_mutex.patch"
-  
-  # https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6074
-  msg "applying 0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch"
+  msg "0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch"
   patch -p1 -i "${srcdir}/0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch"
 
   msg "All patches have successfully been applied"