From d72c260b2300ef96eef70057dd118b0fc1f5897b Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 16 Apr 2015 16:29:34 -0400 Subject: [PATCH] Linux v4.0-7084-g497a5df7bf6f --- arm64-avoid-needing-console-to-enable-serial-console.patch | 4 ++-- kernel.spec | 5 ++++- sources | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arm64-avoid-needing-console-to-enable-serial-console.patch b/arm64-avoid-needing-console-to-enable-serial-console.patch index 837c4c3f0..b40baa30e 100644 --- a/arm64-avoid-needing-console-to-enable-serial-console.patch +++ b/arm64-avoid-needing-console-to-enable-serial-console.patch @@ -14,10 +14,10 @@ Signed-off-by: Mark Salter 1 file changed, 19 insertions(+) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index e8420f635bd4..84733810614c 100644 +index 51ef97274b52..784731f5c45e 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c -@@ -547,3 +547,22 @@ const struct seq_operations cpuinfo_op = { +@@ -568,3 +568,22 @@ const struct seq_operations cpuinfo_op = { .stop = c_stop, .show = c_show }; diff --git a/kernel.spec b/kernel.spec index d2e12a6ef..b621625c1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2187,6 +2187,9 @@ fi # # %changelog +* Thu Apr 16 2015 Josh Boyer - 4.1.0-0.rc0.git5.1 +- Linux v4.0-7084-g497a5df7bf6f + * Thu Apr 16 2015 Josh Boyer - 4.1.0-0.rc0.git4.1 - Linux v4.0-6817-geea3a00264cf diff --git a/sources b/sources index 7a1d5c418..12c1327e9 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz 386fb222abea7dbffaa8560a756336cf patch-4.0-git4.xz +6d2862ae0c0cf36266efc6fcdae760f9 patch-4.0-git5.xz