kernel-arm64.patch: fix up merge conflict and re-enable

This commit is contained in:
Kyle McMartin 2014-08-12 11:18:04 -04:00
parent 39f3a276ce
commit 5da751d082
2 changed files with 78 additions and 2362 deletions

File diff suppressed because it is too large Load Diff

View File

@ -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.
@ -2240,6 +2240,9 @@ fi
# ||----w |
# || ||
%changelog
* Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org>
- kernel-arm64.patch: fix up merge conflict and re-enable
* Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git4.1
- Linux v3.16-10473-gc8d6637d0497