diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-30 19:12:31 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-30 19:12:31 +0100 |
commit | 22e606deb3e4bceff8c16fab4d6c2a13b6cc4d62 (patch) | |
tree | 4b7a721ccdc44678fde613ec06248bd8b1a2bc68 | |
parent | 189120fada0c7e08ad7cb421bd00f5f1a29ebf8a (diff) | |
parent | 2721cfeb56d59312d21ff44e4bf3ad006b61f322 (diff) | |
download | kernel-22e606deb3e4bceff8c16fab4d6c2a13b6cc4d62.tar.gz kernel-22e606deb3e4bceff8c16fab4d6c2a13b6cc4d62.tar.xz kernel-22e606deb3e4bceff8c16fab4d6c2a13b6cc4d62.zip |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc6.git0.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc6.git0.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc6.git0.1.vanilla.knurd.1.fc24
-rw-r--r-- | 0001-Work-around-for-gcc7-and-arm64.patch | 62 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 16 | ||||
-rw-r--r-- | sources | 3 |
4 files changed, 77 insertions, 6 deletions
diff --git a/0001-Work-around-for-gcc7-and-arm64.patch b/0001-Work-around-for-gcc7-and-arm64.patch new file mode 100644 index 000000000..88f40be5d --- /dev/null +++ b/0001-Work-around-for-gcc7-and-arm64.patch @@ -0,0 +1,62 @@ +From 975dcf140bd307b431aff7b6d671155c796cfe5e Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Sat, 28 Jan 2017 16:13:49 +0100 +Subject: [PATCH] Work around for gcc7 and arm64 + +Originally proposed by Will Deacon <will.deacon@arm.com> + +http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/462224.html + +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + include/linux/log2.h | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/include/linux/log2.h b/include/linux/log2.h +index fd7ff3d91e6a..1ab22b79681e 100644 +--- a/include/linux/log2.h ++++ b/include/linux/log2.h +@@ -16,12 +16,6 @@ + #include <linux/bitops.h> + + /* +- * deal with unrepresentable constant logarithms +- */ +-extern __attribute__((const, noreturn)) +-int ____ilog2_NaN(void); +- +-/* + * non-constant log of base 2 calculators + * - the arch may override these in asm/bitops.h if they can be implemented + * more efficiently than using fls() and fls64() +@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) + #define ilog2(n) \ + ( \ + __builtin_constant_p(n) ? ( \ +- (n) < 1 ? ____ilog2_NaN() : \ ++ (n) < 1 ? 0 : \ + (n) & (1ULL << 63) ? 63 : \ + (n) & (1ULL << 62) ? 62 : \ + (n) & (1ULL << 61) ? 61 : \ +@@ -149,9 +143,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) + (n) & (1ULL << 3) ? 3 : \ + (n) & (1ULL << 2) ? 2 : \ + (n) & (1ULL << 1) ? 1 : \ +- (n) & (1ULL << 0) ? 0 : \ +- ____ilog2_NaN() \ +- ) : \ ++ 0 ) : \ + (sizeof(n) <= 4) ? \ + __ilog2_u32(n) : \ + __ilog2_u64(n) \ +@@ -194,7 +186,6 @@ unsigned long __rounddown_pow_of_two(unsigned long n) + * @n: parameter + * + * The first few values calculated by this routine: +- * ob2(0) = 0 + * ob2(1) = 0 + * ob2(2) = 1 + * ob2(3) = 2 +-- +2.11.0 + @@ -1 +1 @@ -1b1bc42c1692e9b62756323c675a44cb1a1f9dbd +566cf877a1fcb6d6dc0126b076aad062054c2637 diff --git a/kernel.spec b/kernel.spec index c9965aac7..bf3e3761c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 5 +%global rcrev 6 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -610,6 +610,9 @@ Patch851: Armada-trace-build-fix.patch # selinux: allow context mounts on tmpfs, ramfs, devpts within user namespaces Patch852: selinux-allow-context-mounts-on-tmpfs-etc.patch +# See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html +Patch853: 0001-Work-around-for-gcc7-and-arm64.patch + # END OF PATCH DEFINITIONS %endif @@ -2183,6 +2186,13 @@ fi # # %changelog +* Mon Jan 30 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc6.git0.1 +- Linux v4.10-rc6 +- Disable debugging options. + +* Sat Jan 28 2017 Laura Abbott <labbott@redhat.com> - 4.10.0-0.rc5.git4.2 +- Temporary workaround for gcc7 and arm64 + * Fri Jan 27 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc5.git4.1 - Linux v4.10-rc5-367-g1b1bc42 @@ -1,4 +1,3 @@ SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99 -SHA512 (patch-4.10-rc5.xz) = 5c51bce76af4e6f4637aaa059a9211c958d3d26332ef9efab421586069b1df5610b781908359da325dd114c9a6567f45be45a3c6bae6830586af69669d05910a -SHA512 (patch-4.10-rc5-git4.xz) = 7375743789e8fb13bacb256290bd3e7c38ff0ee02875705b67a16e32fc72b4cbb99014d6be48e082f4bf02bcbcc2aae27c7f6c8087f66b5732007aa559254d6f +SHA512 (patch-4.10-rc6.xz) = eb6dfcdcb427d198d955b6c2146abd5c6a74d01ab10855d713f33b9c87df05f20f2688cb354d5881dfb82ebdcf4ecac37b36956ff3645977f967f021b52ad507 |