From 07e9208236b13b2a5171b28b44a15c84cf893d24 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Thu, 26 Jan 2017 17:25:22 -0800 Subject: [PATCH] Update kernels to 4.9.6 and 4.4.45 Signed-off-by: Riyaz Faizullabhoy --- alpine/kernel/Dockerfile | 2 +- alpine/kernel/Dockerfile.4.4 | 2 +- alpine/kernel/Dockerfile.aufs | 2 +- ...ix-time_to_jiffies-nsec-sanity-check.patch | 35 ------------------- 4 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 alpine/kernel/patches-4.9/0006-fuse-fix-time_to_jiffies-nsec-sanity-check.patch diff --git a/alpine/kernel/Dockerfile b/alpine/kernel/Dockerfile index 86315eae0..03805eaf5 100644 --- a/alpine/kernel/Dockerfile +++ b/alpine/kernel/Dockerfile @@ -1,7 +1,7 @@ # Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c -ARG KERNEL_VERSION=4.9.5 +ARG KERNEL_VERSION=4.9.6 ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz diff --git a/alpine/kernel/Dockerfile.4.4 b/alpine/kernel/Dockerfile.4.4 index d0febb061..e2f91f5d1 100644 --- a/alpine/kernel/Dockerfile.4.4 +++ b/alpine/kernel/Dockerfile.4.4 @@ -1,7 +1,7 @@ # Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c -ARG KERNEL_VERSION=4.4.44 +ARG KERNEL_VERSION=4.4.45 ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz diff --git a/alpine/kernel/Dockerfile.aufs b/alpine/kernel/Dockerfile.aufs index 3180780b4..95025c998 100644 --- a/alpine/kernel/Dockerfile.aufs +++ b/alpine/kernel/Dockerfile.aufs @@ -1,7 +1,7 @@ # Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c -ARG KERNEL_VERSION=4.9.5 +ARG KERNEL_VERSION=4.9.6 ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz diff --git a/alpine/kernel/patches-4.9/0006-fuse-fix-time_to_jiffies-nsec-sanity-check.patch b/alpine/kernel/patches-4.9/0006-fuse-fix-time_to_jiffies-nsec-sanity-check.patch deleted file mode 100644 index fad39cf2c..000000000 --- a/alpine/kernel/patches-4.9/0006-fuse-fix-time_to_jiffies-nsec-sanity-check.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4c63fbce6abc0eb36a21d760959aae954427dcf3 Mon Sep 17 00:00:00 2001 -From: David Sheets -Date: Fri, 13 Jan 2017 15:58:30 +0000 -Subject: [PATCH 06/11] fuse: fix time_to_jiffies nsec sanity check - -Commit bcb6f6d2b9c2 ("fuse: use timespec64") introduced clamped nsec values -in time_to_jiffies but used the max of nsec and NSEC_PER_SEC - 1 instead of -the min. Because of this, dentries would stay in the cache longer than -requested and go stale in scenarios that relied on their timely eviction. - -Fixes: bcb6f6d2b9c2 ("fuse: use timespec64") -Signed-off-by: David Sheets -Signed-off-by: Miklos Szeredi -Cc: # 4.9 -(cherry picked from commit 210675270caa33253e4c33f3c5e657e7d6060812) ---- - fs/fuse/dir.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c -index 096f79997f75..642c57b8de7b 100644 ---- a/fs/fuse/dir.c -+++ b/fs/fuse/dir.c -@@ -68,7 +68,7 @@ static u64 time_to_jiffies(u64 sec, u32 nsec) - if (sec || nsec) { - struct timespec64 ts = { - sec, -- max_t(u32, nsec, NSEC_PER_SEC - 1) -+ min_t(u32, nsec, NSEC_PER_SEC - 1) - }; - - return get_jiffies_64() + timespec64_to_jiffies(&ts); --- -2.11.0 -