summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFigue2016-02-26 00:34:04 +0100
committerFigue2016-02-26 00:34:04 +0100
commite844bd779df0a7124d92d2dd71b31a4390a8cf9d (patch)
treedf665d3279614552998351a6d56edbdd2e6db86c
parent9eb9d5bc1e4c60bea8fe8791271f57f51c3d3c81 (diff)
downloadaur-e844bd779df0a7124d92d2dd71b31a4390a8cf9d.tar.gz
Update to 4.4.3
-rw-r--r--.SRCINFO18
-rw-r--r--0001-4.4-revert-btrfs.patch78
-rw-r--r--0001-4.4-revert-xfs.patch39
-rw-r--r--PKGBUILD14
4 files changed, 10 insertions, 139 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ca9455ec2929..18d72a642f1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Fri Feb 19 23:23:35 UTC 2016
+# Thu Feb 25 23:33:39 UTC 2016
pkgbase = linux-bld
- pkgver = 4.4.2
+ pkgver = 4.4.3
pkgrel = 1
url = https://github.com/rmullick/linux
arch = i686
@@ -13,8 +13,8 @@ pkgbase = linux-bld
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/v4.x/patch-4.4.3.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.3.sign
source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
source = config
source = config.x86_64
@@ -25,11 +25,9 @@ pkgbase = linux-bld
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
source = https://raw.githubusercontent.com/rmullick/bld-patches/master/BLD-4.4.patch
source = 0001-sdhci-revert.patch
- source = 0001-4.4-revert-btrfs.patch
- source = 0001-4.4-revert-xfs.patch
sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
sha256sums = SKIP
- sha256sums = 5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c
+ sha256sums = 4a24c79c40b2cb820ce9f22d44f31edcbde5971432753ab0289772946ed05b7b
sha256sums = SKIP
sha256sums = cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791
sha256sums = fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64
@@ -41,8 +39,6 @@ pkgbase = linux-bld
sha256sums = 69a21bc286a628128cfc4723558829cb6ff6c2d7c4dfd4468457898674187b25
sha256sums = 66f800ae606ae197dc80f3207d4e688fd3981ee6eab11b52ce84fcf3aed977ff
sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375
- sha256sums = 51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958
- sha256sums = ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad
pkgname = linux-bld
pkgdesc = The Linux-bld kernel and modules with BLD patches
@@ -52,14 +48,14 @@ pkgname = linux-bld
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = kernel26-bld=4.4.2
+ provides = kernel26-bld=4.4.3
conflicts = kernel26-bld
replaces = kernel26-bld
backup = etc/mkinitcpio.d/linux-bld.preset
pkgname = linux-bld-headers
pkgdesc = Header files and scripts for building modules for Linux-bld kernel
- provides = kernel26-bld-headers=4.4.2
+ provides = kernel26-bld-headers=4.4.3
conflicts = kernel26-bld-headers
replaces = kernel26-bld-headers
diff --git a/0001-4.4-revert-btrfs.patch b/0001-4.4-revert-btrfs.patch
deleted file mode 100644
index 4b56e242ec2d..000000000000
--- a/0001-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/0001-4.4-revert-xfs.patch b/0001-4.4-revert-xfs.patch
deleted file mode 100644
index 93eb1929ff32..000000000000
--- a/0001-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
-
diff --git a/PKGBUILD b/PKGBUILD
index 968b9e02ef9b..54aeba251052 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=linux-bld # Build kernel with a different name
_srcname=linux-4.4
pkgname=(linux-bld linux-bld-headers)
_kernelname=-bld
-pkgver=4.4.2
+pkgver=4.4.3
pkgrel=1
arch=('i686' 'x86_64')
url="https://github.com/rmullick/linux"
@@ -32,13 +32,11 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfqversion}-for.patch"
"https://raw.githubusercontent.com/rmullick/bld-patches/master/${_BLDpatch}"
"0001-sdhci-revert.patch"
- "0001-4.4-revert-btrfs.patch"
- "0001-4.4-revert-xfs.patch"
)
sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
'SKIP'
- '5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c'
+ '4a24c79c40b2cb820ce9f22d44f31edcbde5971432753ab0289772946ed05b7b'
'SKIP'
'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791'
'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64'
@@ -49,9 +47,7 @@ sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
'b17c3fb18c5b8c20a45a38198f293679ca6aef08d16f12cd816a5cfafac4b2c4'
'69a21bc286a628128cfc4723558829cb6ff6c2d7c4dfd4468457898674187b25'
'66f800ae606ae197dc80f3207d4e688fd3981ee6eab11b52ce84fcf3aed977ff'
- '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
- '51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958'
- 'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad')
+ '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -107,10 +103,6 @@ prepare() {
# https://bugzilla.kernel.org/show_bug.cgi?id=106541
patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch"
- # #47757 fix broken suspend from btrfs and xfs
- patch -Np1 -i "${srcdir}/0001-4.4-revert-xfs.patch"
- patch -Np1 -i "${srcdir}/0001-4.4-revert-btrfs.patch"
-
if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config
else