summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2015-10-22 18:59:00 -0400
committergraysky2015-10-22 18:59:00 -0400
commit59cf95ed37ff9147265c1ed576e7fa8a53f05675 (patch)
tree7a598e3a1bc7d4844ceef3f701300eb73b13fe81
parentce2f8e2a2638caca3095f4cc4adcda36bd9f1d64 (diff)
downloadaur-59cf95ed37ff9147265c1ed576e7fa8a53f05675.tar.gz
Update to 4.1.11-1
-rw-r--r--.SRCINFO18
-rw-r--r--0000-fix_potential_deadlock_in_reqsk_queue_unlink.patch37
-rw-r--r--PKGBUILD11
3 files changed, 11 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1d26b60ffbc..039215f2b7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-ck
- pkgver = 4.1.10
- pkgrel = 3
+ pkgver = 4.1.11
+ pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = i686
arch = x86_64
@@ -11,13 +11,12 @@ pkgbase = linux-ck
options = !strip
source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.sign
- source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.10.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.10.sign
+ source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.11.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.11.sign
source = config.x86_64
source = config
source = linux-ck.preset
source = change-default-console-loglevel.patch
- source = 0000-fix_potential_deadlock_in_reqsk_queue_unlink.patch
source = http://ck.kolivas.org/patches/4.0/4.1/4.1-ck2/patch-4.1-ck2.bz2
source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r8-4.1.patch
@@ -25,13 +24,12 @@ pkgbase = linux-ck
source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch
sha256sums = caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f
sha256sums = SKIP
- sha256sums = 929e210fe6dbd5dd26812c146630be14e979aae6c960a2feb39544babb8e73cb
+ sha256sums = f98156dd7ceac2849de16b38cdb7a530cd3c74833ab613e0822b7bc4583cccb1
sha256sums = SKIP
sha256sums = b04ce2128ddb94be5ffafb4383d5c8b016760500696b1426a6e552c9a61ab27c
sha256sums = cc181fe0cfcedcd3bf606d7cce53e07dfb206d6c3549238dc7f4d0d27973d1a4
sha256sums = 2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
- sha256sums = fd5dcb1847fc22f36892673066c801e818dce42d1f709dafa9f12bf8337024f3
sha256sums = 87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428
sha256sums = 819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532
sha256sums = ec0ca3c8051ea6d9a27a450998af8162464c224299deefc29044172940e96975
@@ -47,7 +45,7 @@ pkgname = linux-ck
optdepends = crda: to set the correct wireless channels of your country
optdepends = nvidia-ck: nVidia drivers for linux-ck
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
- provides = linux-ck=4.1.10
+ provides = linux-ck=4.1.11
conflicts = kernel26-ck
conflicts = linux-ck-corex
conflicts = linux-ck-p4
@@ -71,8 +69,8 @@ pkgname = linux-ck
pkgname = linux-ck-headers
pkgdesc = Header files and scripts to build modules for linux-ck.
depends = linux-ck
- provides = linux-ck-headers=4.1.10
- provides = linux-headers=4.1.10
+ provides = linux-ck-headers=4.1.11
+ provides = linux-headers=4.1.11
conflicts = kernel26-ck-headers
conflicts = linux-ck-corex-headers
conflicts = linux-ck-p4-headers
diff --git a/0000-fix_potential_deadlock_in_reqsk_queue_unlink.patch b/0000-fix_potential_deadlock_in_reqsk_queue_unlink.patch
deleted file mode 100644
index e5c38d40b07..00000000000
--- a/0000-fix_potential_deadlock_in_reqsk_queue_unlink.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 83fccfc3940c4a2db90fd7e7079f5b465cd8c6af Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Thu, 13 Aug 2015 15:44:51 -0700
-Subject: inet: fix potential deadlock in reqsk_queue_unlink()
-
-When replacing del_timer() with del_timer_sync(), I introduced
-a deadlock condition :
-
-reqsk_queue_unlink() is called from inet_csk_reqsk_queue_drop()
-
-inet_csk_reqsk_queue_drop() can be called from many contexts,
-one being the timer handler itself (reqsk_timer_handler()).
-
-In this case, del_timer_sync() loops forever.
-
-Simple fix is to test if timer is pending.
-
-Fixes: 2235f2ac75fd ("inet: fix races with reqsk timers")
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
-index 05e3145..1349571 100644
---- a/net/ipv4/inet_connection_sock.c
-+++ b/net/ipv4/inet_connection_sock.c
-@@ -593,7 +593,7 @@ static bool reqsk_queue_unlink(struct request_sock_queue *queue,
- }
-
- spin_unlock(&queue->syn_wait_lock);
-- if (del_timer_sync(&req->rsk_timer))
-+ if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer))
- reqsk_put(req);
- return found;
- }
---
-cgit v0.10.2
-
diff --git a/PKGBUILD b/PKGBUILD
index bde0ab502c1..a0e377b5550 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,8 +52,8 @@ _BFQ_enable_=
pkgname=(linux-ck linux-ck-headers)
_kernelname=-ck
_srcname=linux-4.1
-pkgver=4.1.10
-pkgrel=3
+pkgver=4.1.11
+pkgrel=1
arch=('i686' 'x86_64')
url="https://wiki.archlinux.org/index.php/Linux-ck"
license=('GPL2')
@@ -70,7 +70,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'config.x86_64' 'config'
'linux-ck.preset'
'change-default-console-loglevel.patch'
-'0000-fix_potential_deadlock_in_reqsk_queue_unlink.patch'
# ck1
"http://ck.kolivas.org/patches/4.0/4.1/4.1-ck${_ckpatchversion}/${_ckpatchname}.bz2"
# gcc
@@ -81,13 +80,12 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch")
sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
'SKIP'
- '929e210fe6dbd5dd26812c146630be14e979aae6c960a2feb39544babb8e73cb'
+ 'f98156dd7ceac2849de16b38cdb7a530cd3c74833ab613e0822b7bc4583cccb1'
'SKIP'
'b04ce2128ddb94be5ffafb4383d5c8b016760500696b1426a6e552c9a61ab27c'
'cc181fe0cfcedcd3bf606d7cce53e07dfb206d6c3549238dc7f4d0d27973d1a4'
'2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- 'fd5dcb1847fc22f36892673066c801e818dce42d1f709dafa9f12bf8337024f3'
'87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428'
'819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532'
'ec0ca3c8051ea6d9a27a450998af8162464c224299deefc29044172940e96975'
@@ -109,9 +107,6 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
- # fix https://bbs.archlinux.org/viewtopic.php?pid=1568197#p1568197
- patch -Np1 -i "$srcdir/0000-fix_potential_deadlock_in_reqsk_queue_unlink.patch"
-
# patch source with ck patchset with BFS
# fix double name in EXTRAVERSION
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "${srcdir}/${_ckpatchname}"