diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2015-02-11 12:17:28 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2015-02-11 12:17:28 -0600 |
| commit | b95d59c7fc90d656d1ccc339bb644578a79e339a (patch) | |
| tree | 79b5eebf4ea63f7b69322dbf1ac11bd0254b5ff9 | |
| parent | cb9feb8536116460e9c5036a01f6058d11e1c2cb (diff) | |
| download | kernel-b95d59c7fc90d656d1ccc339bb644578a79e339a.tar.gz kernel-b95d59c7fc90d656d1ccc339bb644578a79e339a.tar.xz kernel-b95d59c7fc90d656d1ccc339bb644578a79e339a.zip | |
Linux v3.18.7
| -rw-r--r-- | kernel-arm64.patch | 6 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/kernel-arm64.patch b/kernel-arm64.patch index 5be6cb92..e98d10a4 100644 --- a/kernel-arm64.patch +++ b/kernel-arm64.patch @@ -4483,9 +4483,9 @@ index 2437196..914287d 100644 #include <linux/of_platform.h> #include <linux/efi.h> +#include <linux/acpi.h> + #include <linux/personality.h> #include <asm/fixmap.h> - #include <asm/cpu.h> @@ -59,6 +60,7 @@ #include <asm/memblock.h> #include <asm/psci.h> @@ -4512,9 +4512,9 @@ index 2437196..914287d 100644 bool arch_match_cpu_phys_id(int cpu, u64 phys_id) @@ -312,6 +318,7 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) + while (true) + cpu_relax(); } - - machine_name = of_flat_dt_get_machine_name(); + dump_stack_set_arch_desc("%s (DT)", machine_name); } diff --git a/kernel.spec b/kernel.spec index 3b8fac5a..d4655756 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 6 +%define stable_update 7 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -2251,6 +2251,9 @@ fi # ||----w | # || || %changelog +* Wed Feb 11 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.18.7-200 +- Linux v3.18.7 + * Fri Feb 06 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.18.6-200 - Linux v3.18.6 @@ -1,3 +1,3 @@ 9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz 813ccb96f0b379d656e57442c2587ca3 perf-man-3.18.tar.gz -30aa769974e64fd17a01724d1577a913 patch-3.18.6.xz +9db3178b87ddf7c05e6191bf57645610 patch-3.18.7.xz |