From bdaa8443344b7da7947cc00237fad38c2cff7d5e Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 5 Sep 2018 12:51:12 -0700 Subject: [PATCH] Linux v4.18.6 --- arm-fix-bpf-jit.patch | 25 ------------------------- kernel.spec | 7 ++++--- sources | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 arm-fix-bpf-jit.patch diff --git a/arm-fix-bpf-jit.patch b/arm-fix-bpf-jit.patch deleted file mode 100644 index f76af6698..000000000 --- a/arm-fix-bpf-jit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 06a5c5fa1f0675523d573c210d4350b775b2c679 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Fri, 17 Aug 2018 15:35:18 +0100 -Subject: [PATCH] test arm bpf jit - ---- - arch/arm/net/bpf_jit_32.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c -index f6a62ae44a65b..c864f6b045ba5 100644 ---- a/arch/arm/net/bpf_jit_32.c -+++ b/arch/arm/net/bpf_jit_32.c -@@ -238,7 +238,7 @@ static void jit_fill_hole(void *area, unsigned int size) - #define STACK_SIZE ALIGN(_STACK_SIZE, STACK_ALIGNMENT) - - /* Get the offset of eBPF REGISTERs stored on scratch space. */ --#define STACK_VAR(off) (STACK_SIZE - off) -+#define STACK_VAR(off) (STACK_SIZE - off - 4) - - #if __LINUX_ARM_ARCH__ < 7 - --- -2.17.1 - diff --git a/kernel.spec b/kernel.spec index 2d288df53..e82620443 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 5 +%define stable_update 6 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -612,8 +612,6 @@ Patch334: drm-vc4-Fix-the-no-scaling-case-on-multi-planar-YUV-formats.patch Patch350: arm64-arch_timer-Workaround-for-Allwinner-A64-timer-instability.patch Patch351: arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch -Patch399: arm-fix-bpf-jit.patch - # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -1914,6 +1912,9 @@ fi # # %changelog +* Wed Sep 05 2018 Laura Abbott - 4.18.6-300 +- Linux v4.18.6 + * Fri Aug 24 2018 Laura Abbott - 4.18.5-300 - Linux v4.18.5 diff --git a/sources b/sources index ee6b7a25f..d94768bed 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 -SHA512 (patch-4.18.5.xz) = b7c1457b92051d79a6dfe1d1acbe3e9cf589ba1aac0db61d76a500f0966854307c35e91016b6175f2a863a4cd63e0c99fa879eea2e5467d38e86afa44bfcfd52 +SHA512 (patch-4.18.6.xz) = 9fe507cfc549e02fc52580cafa7a663522d3793830d2ac7e7f7686f68c20928b91395849cf5387831f79e42affe292665cb360541390be666987b3a0bab5ee1e