summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorblackleg2016-03-11 18:25:02 +0100
committerblackleg2016-03-11 18:25:02 +0100
commitfd8cfd29d4a00c068d3bf1bef39a1090ccea60bf (patch)
treed56df34390115d0bef4290fc78730c5a346ada9f
parent885d4512867fe5c28f9dd11694222c14b41082c8 (diff)
downloadaur-linux-w110er.tar.gz
Update to 4.4.5
-rw-r--r--.SRCINFO24
-rw-r--r--0001-4.4-revert-btrfs.patch78
-rw-r--r--0001-4.4-revert-xfs.patch39
-rw-r--r--PKGBUILD22
-rw-r--r--tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch24
5 files changed, 13 insertions, 174 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6e9b2823110..10ecb0c159ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Sun Feb 14 15:05:32 UTC 2016
+# Fri Mar 11 17:24:46 UTC 2016
pkgbase = linux-w110er
- pkgver = 4.4.1
+ pkgver = 4.4.5
pkgrel = 1
url = http://www.kernel.org/
arch = x86_64
@@ -14,51 +14,45 @@ pkgbase = linux-w110er
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.1.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.5.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.5.sign
source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
source = config.w110er
source = linux.preset
source = change-default-console-loglevel.patch
source = 0001-sdhci-revert.patch
- source = tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch
- source = 0001-4.4-revert-btrfs.patch
- source = 0001-4.4-revert-xfs.patch
md5sums = 9a78fa2eb6c68ca5a40ed5af08142599
md5sums = SKIP
- md5sums = d9e951895c8c249f0bf52d85f3e63bce
+ md5sums = edddb33405ea1ab02b90eb9cecaa43f6
md5sums = SKIP
md5sums = 2bb07837febe3baaced4c1c0afb0507c
md5sums = 3b0b8e0ea48b3320c950cd5c6958141f
md5sums = eb14dcfd80c00852ef81ded6e826826a
md5sums = df7fceae6ee5d7e7be7b60ecd7f6bb35
md5sums = e1093d9bc718f362344ab56b85d4fb76
- md5sums = a00ad770d2a49a282a8bbf951852c2a1
- md5sums = d0b2697353a167f0ca1e24506589cd22
- md5sums = 7820a5f4c97660d4c9272ea599e3cdcc
pkgname = linux-w110er
- pkgdesc = Linux 4.4.1 kernel and modules optimized for Mountain F11 Netbook (Clevo W110ER). See PKGBUILD
+ pkgdesc = Linux 4.4.5 kernel and modules optimized for Mountain F11 Netbook (Clevo W110ER). See PKGBUILD
install = linux.install
depends = coreutils
depends = linux-firmware
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = kernel26-w110er=4.4.1
+ provides = kernel26-w110er=4.4.5
conflicts = kernel26-w110er
replaces = kernel26-w110er
backup = etc/mkinitcpio.d/linux-w110er.preset
pkgname = linux-w110er-headers
pkgdesc = Header files and scripts for building modules for Linux-w110er kernel
- provides = kernel26-w110er-headers=4.4.1
+ provides = kernel26-w110er-headers=4.4.5
conflicts = kernel26-w110er-headers
replaces = kernel26-w110er-headers
pkgname = linux-w110er-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-w110er kernel
- provides = kernel26-w110er-docs=4.4.1
+ provides = kernel26-w110er-docs=4.4.5
conflicts = kernel26-w110er-docs
replaces = kernel26-w110er-docs
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 a5a022988e1c..50f9bbbeaf43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@
pkgbase=linux-w110er
_srcname=linux-4.4
-pkgver=4.4.1
+pkgver=4.4.5
pkgrel=1
arch=('x86_64')
url="http://www.kernel.org/"
@@ -36,23 +36,17 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
# standard config files for mkinitcpio ramdisk
'linux.preset'
'change-default-console-loglevel.patch'
- '0001-sdhci-revert.patch'
- 'tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch'
- '0001-4.4-revert-btrfs.patch'
- '0001-4.4-revert-xfs.patch')
+ '0001-sdhci-revert.patch')
md5sums=('9a78fa2eb6c68ca5a40ed5af08142599'
'SKIP'
- 'd9e951895c8c249f0bf52d85f3e63bce'
+ 'edddb33405ea1ab02b90eb9cecaa43f6'
'SKIP'
'2bb07837febe3baaced4c1c0afb0507c'
'3b0b8e0ea48b3320c950cd5c6958141f'
'eb14dcfd80c00852ef81ded6e826826a'
'df7fceae6ee5d7e7be7b60ecd7f6bb35'
- 'e1093d9bc718f362344ab56b85d4fb76'
- 'a00ad770d2a49a282a8bbf951852c2a1'
- 'd0b2697353a167f0ca1e24506589cd22'
- '7820a5f4c97660d4c9272ea599e3cdcc')
+ 'e1093d9bc718f362344ab56b85d4fb76')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -75,14 +69,6 @@ prepare() {
# https://bugzilla.kernel.org/show_bug.cgi?id=106541
patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch"
- # fixes #47805 kernel panics on platform modules
- # https://bugzilla.kernel.org/show_bug.cgi?id=110751
- patch -Np1 -i "${srcdir}/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.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"
-
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
diff --git a/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch b/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch
deleted file mode 100644
index 691ab79b9d2f..000000000000
--- a/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/drivers/base/platform.c b/drivers/base/platform.c
-index 1dd6d3b..176b59f 100644
---- a/drivers/base/platform.c
-+++ b/drivers/base/platform.c
-@@ -513,10 +513,15 @@ static int platform_drv_probe(struct device *_dev)
- return ret;
-
- ret = dev_pm_domain_attach(_dev, true);
-- if (ret != -EPROBE_DEFER && drv->probe) {
-- ret = drv->probe(dev);
-- if (ret)
-- dev_pm_domain_detach(_dev, true);
-+ if (ret != -EPROBE_DEFER) {
-+ if (drv->probe) {
-+ ret = drv->probe(dev);
-+ if (ret)
-+ dev_pm_domain_detach(_dev, true);
-+ } else {
-+ /* don't fail if just dev_pm_domain_attach failed */
-+ ret = 0;
-+ }
- }
-
- if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {