diff options
author | sirlucjan | 2016-02-29 13:21:06 +0100 |
---|---|---|
committer | sirlucjan | 2016-02-29 13:21:06 +0100 |
commit | 4e06f9278209ca284f7229327ad24eb331de0f7a (patch) | |
tree | e4550349d74dbe72f260266a1971fa74cde82eb4 | |
parent | 893003e6053c09f92487fbca6c1804608b9e3b7d (diff) | |
download | aur-4e06f9278209ca284f7229327ad24eb331de0f7a.tar.gz |
Bump to 4.4.4-rt9
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | 0007-4.4-revert-btrfs.patch | 78 | ||||
-rw-r--r-- | 0008-4.4-revert-xfs.patch | 39 | ||||
-rw-r--r-- | PKGBUILD | 23 |
4 files changed, 15 insertions, 145 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Thu Feb 25 15:33:02 UTC 2016 +# Mon Feb 29 12:20:40 UTC 2016 pkgbase = linux-rt-bfq - pkgver = 4.4.2_rt7 + pkgver = 4.4.3_rt9 pkgrel = 1 url = http://algo.ing.unimo.it arch = i686 @@ -13,10 +13,10 @@ pkgbase = linux-rt-bfq options = !strip source = http://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 = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.2.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.2.sign - source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.2-rt7.patch.xz - source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.2-rt7.patch.sign + source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.3.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.3.sign + source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.3-rt9.patch.xz + source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.3-rt9.patch.sign source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.4.0.patch source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.4.0.patch source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch @@ -27,13 +27,11 @@ pkgbase = linux-rt-bfq source = config.x86_64 source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.patch source = 0004-sdhci-revert.patch - source = 0007-4.4-revert-btrfs.patch - source = 0008-4.4-revert-xfs.patch sha512sums = 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e sha512sums = SKIP - sha512sums = 3222ddc913d14cd4b4ae999890afb580db9a79337dcd42876db6bbf08d351982bb1849fd97152915b570a3408ddd2be645e851736615f90ad8354244116ae12c + sha512sums = 8477ecd07d06bc6c6d75dc95027920e1f41128fa8a6b382377d7a0a64ccbca719a464ef64397a3715e7ffe400640c6590ab5da691690472d1f9311ed82041d50 sha512sums = SKIP - sha512sums = 2ab9c7bdf2f5b43a74840a82f34f4a354c3a0c21407993ca1afc84b077f29a5a1e34079d70705a59f853e4c48665d763ffd379e3637c6dc8616cfafc517c6280 + sha512sums = 1e0a4f94bc2d80f734cfec7dba95ca5b9d2d027dea203805089915a28c4a87d5a1b019236a997eee2dfaca254023bed6f73f6fbd8b8a28abf9fc2a935435a859 sha512sums = SKIP sha512sums = bfd5d1a2d8f203e4d13914d311e8cc79b81695a41dc24179074cb05a5a9b5b0cc89a77062c6b8f79c850281aaa0d02dce40e23750aea7d1015f675c1cc024027 sha512sums = 275b7573adf648325ab950f8a8be7753f2efac0c4cd5030d31b0482fca0b9b9886c85dec989acde15eadf128366c250ecbd19d5527bfb41f472425fef43e93fd @@ -45,8 +43,6 @@ pkgbase = linux-rt-bfq sha512sums = 56ce250e1b14b03b28dfdf03923ffd173d05edc5fe9dcf5daecd121370e618d62eb8448b930503d69989c9c7ee3e3d8b64768962e78f5a1d08ba1267405192df sha512sums = 326dc571c072d4c47381852f16c00c8a7b27d11a5e6ff0f60f5e3a21d4a833c1e467dda1c2a5c04a6611af48bb6ef017f9183ea4ee578aab1a07e91e44d4e528 sha512sums = be80d7ee558595d4b17b07a5a2b729d9a9503c963ec1b19bac6a87601eaefd28075aea7fb6d9c77e2e15e063fc6a8a2e8744bc1efe63e2a58b8c3ede0d89c821 - sha512sums = 9ebfcb5bfa613bd6b2c2817d3487bd22c2fbbb5f686f68c28912813be141d584b33cc8d8f175ce7cf10ec686902f7336c966b04b00d6aa5409298f1474c58035 - sha512sums = 321a4817ca9a7486f7bf212978e6eeab1481b31c37d35209d7062be7d9f360d5b1f26b2dc45a4c46879c2d14b4ed212b322ea91d0fb85f74d6c298a7cc2a3198 pkgname = linux-rt-bfq pkgdesc = Linux Kernel and modules with the RT patch and the BFQ scheduler. diff --git a/0007-4.4-revert-btrfs.patch b/0007-4.4-revert-btrfs.patch deleted file mode 100644 index 4b56e242ec2d..000000000000 --- a/0007-4.4-revert-btrfs.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 80ad623edd2d0ccb47d85357ee31c97e6c684e82 Mon Sep 17 00:00:00 2001 -From: David Sterba <dsterba@suse.com> -Date: Mon, 25 Jan 2016 11:02:06 +0100 -Subject: Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()" - -This reverts commit 696249132158014d594896df3a81390616069c5c. The -cleaner thread can block freezing when there's a snapshot cleaning in -progress and the other threads get suspended first. From the logs -provided by Martin we're waiting for reading extent pages: - -kernel: PM: Syncing filesystems ... done. -kernel: Freezing user space processes ... (elapsed 0.015 seconds) done. -kernel: Freezing remaining freezable tasks ... -kernel: Freezing of tasks failed after 20.003 seconds (1 tasks refusing to freeze, wq_busy=0): -kernel: btrfs-cleaner D ffff88033dd13bc0 0 152 2 0x00000000 -kernel: ffff88032ebc2e00 ffff88032e750000 ffff88032e74fa50 7fffffffffffffff -kernel: ffffffff814a58df 0000000000000002 ffffea000934d580 ffffffff814a5451 -kernel: 7fffffffffffffff ffffffff814a6e8f 0000000000000000 0000000000000020 -kernel: Call Trace: -kernel: [<ffffffff814a58df>] ? bit_wait+0x2c/0x2c -kernel: [<ffffffff814a5451>] ? schedule+0x6f/0x7c -kernel: [<ffffffff814a6e8f>] ? schedule_timeout+0x2f/0xd8 -kernel: [<ffffffff81076f94>] ? timekeeping_get_ns+0xa/0x2e -kernel: [<ffffffff81077603>] ? ktime_get+0x36/0x44 -kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2 -kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2 -kernel: [<ffffffff814a590b>] ? bit_wait_io+0x2c/0x30 -kernel: [<ffffffff814a5694>] ? __wait_on_bit+0x41/0x73 -kernel: [<ffffffff8109eba8>] ? wait_on_page_bit+0x6d/0x72 -kernel: [<ffffffff8105d718>] ? autoremove_wake_function+0x2a/0x2a -kernel: [<ffffffff811a02d7>] ? read_extent_buffer_pages+0x1bd/0x203 -kernel: [<ffffffff8117d9e9>] ? free_root_pointers+0x4c/0x4c -kernel: [<ffffffff8117e831>] ? btree_read_extent_buffer_pages.constprop.57+0x5a/0xe9 -kernel: [<ffffffff8117f4f3>] ? read_tree_block+0x2d/0x45 -kernel: [<ffffffff8116782a>] ? read_block_for_search.isra.34+0x22a/0x26b -kernel: [<ffffffff811656c3>] ? btrfs_set_path_blocking+0x1e/0x4a -kernel: [<ffffffff8116919b>] ? btrfs_search_slot+0x648/0x736 -kernel: [<ffffffff81170559>] ? btrfs_lookup_extent_info+0xb7/0x2c7 -kernel: [<ffffffff81170ee5>] ? walk_down_proc+0x9c/0x1ae -kernel: [<ffffffff81171c9d>] ? walk_down_tree+0x40/0xa4 -kernel: [<ffffffff8117375f>] ? btrfs_drop_snapshot+0x2da/0x664 -kernel: [<ffffffff8104ff21>] ? finish_task_switch+0x126/0x167 -kernel: [<ffffffff811850f8>] ? btrfs_clean_one_deleted_snapshot+0xa6/0xb0 -kernel: [<ffffffff8117eaba>] ? cleaner_kthread+0x13e/0x17b -kernel: [<ffffffff8117e97c>] ? btrfs_item_end+0x33/0x33 -kernel: [<ffffffff8104d256>] ? kthread+0x95/0x9d -kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16 -kernel: [<ffffffff814a7b5f>] ? ret_from_fork+0x3f/0x70 -kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16 - -As this affects a released kernel (4.4) we need a minimal fix for -stable kernels. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108361 -Reported-by: Martin Ziegler <ziegler@uni-freiburg.de> -CC: stable@vger.kernel.org # 4.4 -CC: Jiri Kosina <jkosina@suse.cz> -Signed-off-by: David Sterba <dsterba@suse.com> -Signed-off-by: Chris Mason <clm@fb.com> ---- - fs/btrfs/disk-io.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c -index 26ef141..404e894 100644 ---- a/fs/btrfs/disk-io.c -+++ b/fs/btrfs/disk-io.c -@@ -1787,7 +1787,6 @@ static int cleaner_kthread(void *arg) - int again; - struct btrfs_trans_handle *trans; - -- set_freezable(); - do { - again = 0; - --- -cgit v0.12 - diff --git a/0008-4.4-revert-xfs.patch b/0008-4.4-revert-xfs.patch deleted file mode 100644 index 93eb1929ff32..000000000000 --- a/0008-4.4-revert-xfs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3e85286e75224fa3f08bdad20e78c8327742634e Mon Sep 17 00:00:00 2001 -From: Dave Chinner <david@fromorbit.com> -Date: Tue, 19 Jan 2016 08:21:46 +1100 -Subject: Revert "xfs: clear PF_NOFREEZE for xfsaild kthread" - -This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it -prevents machines from suspending. This regression occurs when the -xfsaild is idle on entry to suspend, and so there s no activity to -wake it from it's idle sleep and hence see that it is supposed to -freeze. Hence the freezer times out waiting for it and suspend is -cancelled. - -There is no obvious fix for this short of freezing the filesystem -properly, so revert this change for now. - -cc: <stable@vger.kernel.org> # 4.4 -Signed-off-by: Dave Chinner <david@fromorbit.com> -Acked-by: Jiri Kosina <jkosina@suse.cz> -Reviewed-by: Brian Foster <bfoster@redhat.com> -Signed-off-by: Dave Chinner <david@fromorbit.com> ---- - fs/xfs/xfs_trans_ail.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c -index aa67339..4f18fd9 100644 ---- a/fs/xfs/xfs_trans_ail.c -+++ b/fs/xfs/xfs_trans_ail.c -@@ -497,7 +497,6 @@ xfsaild( - long tout = 0; /* milliseconds */ - - current->flags |= PF_MEMALLOC; -- set_freezable(); - - while (!kthread_should_stop()) { - if (tout && tout <= 20) --- -cgit v0.12 - @@ -52,8 +52,8 @@ pkgbase=linux-rt-bfq pkgname=('linux-rt-bfq' 'linux-rt-bfq-headers' 'linux-rt-bfq-docs') _kernelname=-rt-bfq _srcname=linux-4.4 -_pkgver=4.4.2 -_rtpatchver=rt7 +_pkgver=4.4.3 +_rtpatchver=rt9 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64') @@ -80,9 +80,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'change-default-console-loglevel.patch' 'config' 'config.x86_64' 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.patch' - '0004-sdhci-revert.patch' - '0007-4.4-revert-btrfs.patch' - '0008-4.4-revert-xfs.patch') + '0004-sdhci-revert.patch') prepare() { cd ${_srcname} @@ -104,12 +102,7 @@ prepare() { # fixes #47778 sdhci broken on some boards # https://bugzilla.kernel.org/show_bug.cgi?id=106541 msg "Fixes #47778 sdhci broken on some boards" - patch -Rp1 -i "${srcdir}/0004-sdhci-revert.patch" - - ### Fix broken suspend from btrfs and xfs - msg "Fix #47757" - patch -Np1 -i "${srcdir}/0007-4.4-revert-btrfs.patch" - patch -Np1 -i "${srcdir}/0008-4.4-revert-xfs.patch" + patch -Rp1 -i "${srcdir}/0004-sdhci-revert.patch" ### set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream @@ -465,9 +458,9 @@ package_linux-rt-bfq-docs() { sha512sums=('13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e' 'SKIP' - '3222ddc913d14cd4b4ae999890afb580db9a79337dcd42876db6bbf08d351982bb1849fd97152915b570a3408ddd2be645e851736615f90ad8354244116ae12c' + '8477ecd07d06bc6c6d75dc95027920e1f41128fa8a6b382377d7a0a64ccbca719a464ef64397a3715e7ffe400640c6590ab5da691690472d1f9311ed82041d50' 'SKIP' - '2ab9c7bdf2f5b43a74840a82f34f4a354c3a0c21407993ca1afc84b077f29a5a1e34079d70705a59f853e4c48665d763ffd379e3637c6dc8616cfafc517c6280' + '1e0a4f94bc2d80f734cfec7dba95ca5b9d2d027dea203805089915a28c4a87d5a1b019236a997eee2dfaca254023bed6f73f6fbd8b8a28abf9fc2a935435a859' 'SKIP' 'bfd5d1a2d8f203e4d13914d311e8cc79b81695a41dc24179074cb05a5a9b5b0cc89a77062c6b8f79c850281aaa0d02dce40e23750aea7d1015f675c1cc024027' '275b7573adf648325ab950f8a8be7753f2efac0c4cd5030d31b0482fca0b9b9886c85dec989acde15eadf128366c250ecbd19d5527bfb41f472425fef43e93fd' @@ -478,9 +471,7 @@ sha512sums=('13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab71 '756a5c5ec2db9153d0f749c4f358501d78743ab6f7538c7c127aad0a6a0bd21364f15315689f4ccd8c7b559e4cebefdfb8bb55ee90aabe3d0bd5a3d5f00703c7' '56ce250e1b14b03b28dfdf03923ffd173d05edc5fe9dcf5daecd121370e618d62eb8448b930503d69989c9c7ee3e3d8b64768962e78f5a1d08ba1267405192df' '326dc571c072d4c47381852f16c00c8a7b27d11a5e6ff0f60f5e3a21d4a833c1e467dda1c2a5c04a6611af48bb6ef017f9183ea4ee578aab1a07e91e44d4e528' - 'be80d7ee558595d4b17b07a5a2b729d9a9503c963ec1b19bac6a87601eaefd28075aea7fb6d9c77e2e15e063fc6a8a2e8744bc1efe63e2a58b8c3ede0d89c821' - '9ebfcb5bfa613bd6b2c2817d3487bd22c2fbbb5f686f68c28912813be141d584b33cc8d8f175ce7cf10ec686902f7336c966b04b00d6aa5409298f1474c58035' - '321a4817ca9a7486f7bf212978e6eeab1481b31c37d35209d7062be7d9f360d5b1f26b2dc45a4c46879c2d14b4ed212b322ea91d0fb85f74d6c298a7cc2a3198') + 'be80d7ee558595d4b17b07a5a2b729d9a9503c963ec1b19bac6a87601eaefd28075aea7fb6d9c77e2e15e063fc6a8a2e8744bc1efe63e2a58b8c3ede0d89c821') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds |