diff options
| author | Kyle McMartin <kmcmarti@redhat.com> | 2014-08-05 10:24:31 -0400 |
|---|---|---|
| committer | Kyle McMartin <kmcmarti@redhat.com> | 2014-08-05 10:24:31 -0400 |
| commit | d2b85a675da297656fe1fc09f93da2ae7f73e6e1 (patch) | |
| tree | e19086a0029f68be8ef572ee8377582386b736b1 /kernel.spec | |
| parent | 10100651485257bf28bc98647e491bb90631b030 (diff) | |
| download | kernel-d2b85a675da297656fe1fc09f93da2ae7f73e6e1.tar.gz kernel-d2b85a675da297656fe1fc09f93da2ae7f73e6e1.tar.xz kernel-d2b85a675da297656fe1fc09f93da2ae7f73e6e1.zip | |
kernel-arm64.patch: fix up merge conflict and re-enable
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index acbeacf15..e82823133 100644 --- a/kernel.spec +++ b/kernel.spec @@ -8,7 +8,7 @@ Summary: The Linux kernel # be 0. %global released_kernel 0 -%global aarch64patches 0 +%global aarch64patches 1 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -2247,6 +2247,9 @@ fi # ||----w | # || || %changelog +* Tue Aug 05 2014 Kyle McMartin <kyle@fedoraproject.org> +- kernel-arm64.patch: fix up merge conflict and re-enable + * Tue Aug 05 2014 Josh Boyer <jwboyer@gmail.com> - 3.17.0-0.rc0.git1.1 - Linux v3.16-3652-gf19107379dbc - Reenable debugging options. |