diff --git a/kernel-arm64.patch b/kernel-arm64.patch index 964044a..e675c7b 100644 --- a/kernel-arm64.patch +++ b/kernel-arm64.patch @@ -4515,7 +4515,7 @@ index 2437196..914287d 100644 while (true) cpu_relax(); } -+ dump_stack_set_arch_desc("%s (DT)", machine_name); ++ dump_stack_set_arch_desc("%s (DT)", of_flat_dt_get_machine_name()); } /* diff --git a/kernel.spec b/kernel.spec index 3ee921c..217baea 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 200 +%global baserelease 201 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2281,7 +2281,10 @@ fi # ||----w | # || || %changelog -* Fri Feb 27 2015 Josh Boyer - 3.18.8-201 +- Fix up aarch64 build... mis-merge in kernel-arm64.patch. + +* Fri Feb 27 2015 Josh Boyer - 3.18.8-200 - Linux v3.18.8 * Thu Feb 26 2015 Josh Boyer