diff --git a/aarch64-xgene-reset.patch b/aarch64-xgene-reset.patch deleted file mode 100644 index ca24401c9..000000000 --- a/aarch64-xgene-reset.patch +++ /dev/null @@ -1,19 +0,0 @@ -# Fix build failure on aarch64 secondary kernel. -# Should make it into 3.16 shortly -diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h -index b72cf40..ee469be 100644 ---- a/arch/arm64/include/uapi/asm/sigcontext.h -+++ b/arch/arm64/include/uapi/asm/sigcontext.h -@@ -58,7 +58,7 @@ struct fpsimd_context { - - struct esr_context { - struct _aarch64_ctx head; -- u64 esr; -+ __u64 esr; - }; - - #endif /* _UAPI__ASM_SIGCONTEXT_H */ --- -1.9.0 - - diff --git a/kernel.spec b/kernel.spec index 3f9785e92..545ed688a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -591,8 +591,6 @@ Patch14010: lis3-improve-handling-of-null-rate.patch Patch15000: nowatchdog-on-virt.patch # ARM64 -# https://lkml.org/lkml/2014/6/11/534 -Patch21000: aarch64-xgene-reset.patch # ARM @@ -1223,7 +1221,6 @@ ApplyOptionalPatch upstream-reverts.patch -R ApplyPatch 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch # ARM64 -ApplyPatch aarch64-xgene-reset.patch # # ARM @@ -2220,6 +2217,9 @@ fi # ||----w | # || || %changelog +* Thu Jun 19 2014 Josh Boyer - 3.16.0-0.rc1.git3.1 +- Linux v3.16-rc1-112-g894e552cfaa3 + * Thu Jun 19 2014 Peter Robinson - Add missing bits for NVIDIA Jetson TK1 (thanks Stephen Warren) diff --git a/sources b/sources index b5af592cc..6b34b4f1b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 97ca1625bb40368dc41b9a7971549071 linux-3.15.tar.xz ef8f4db937f521a7e323ec589536ba25 perf-man-3.15.tar.gz 8edcef1e40ebea460ba0e43d913ff928 patch-3.16-rc1.xz -d0b9d1a369b93a2e4f77864a8691c16b patch-3.16-rc1-git2.xz +7ce0a784ea436cba2966fdfdccb63974 patch-3.16-rc1-git3.xz