diff options
| author | Kyle McMartin <kmcmarti@redhat.com> | 2014-07-30 17:20:17 -0400 |
|---|---|---|
| committer | Kyle McMartin <kmcmarti@redhat.com> | 2014-07-30 17:20:17 -0400 |
| commit | e59c07299449eec8631231021cc106c7f50f5472 (patch) | |
| tree | 943d25425f0cb2ee30184edae35ecc3a4a2fb3ca /kernel.spec | |
| parent | d14432814761acabc7b08c581a5401de5f204822 (diff) | |
| download | kernel-e59c07299449eec8631231021cc106c7f50f5472.tar.gz kernel-e59c07299449eec8631231021cc106c7f50f5472.tar.xz kernel-e59c07299449eec8631231021cc106c7f50f5472.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 917f107e4..f0874bfcf 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. @@ -2259,6 +2259,9 @@ fi # ||----w | # || || %changelog +* Wed Jul 30 2014 Kyle McMartin <kyle@fedoraproject.org> +- kernel-arm64.patch: fix up merge conflict and re-enable + * Wed Jul 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc7.git2.1 - Linux v3.16-rc7-64-g26bcd8b72563 - Temporarily disable aarch64patches |