diff options
| author | Kyle McMartin <kmcmarti@redhat.com> | 2014-11-11 09:38:12 -0500 |
|---|---|---|
| committer | Kyle McMartin <kmcmarti@redhat.com> | 2014-11-11 09:38:12 -0500 |
| commit | 81c4dc55f83517f99282c822fa0def3e308414b5 (patch) | |
| tree | 2adfbd158485261e11d3fe42f1517d7d3b5a5790 /kernel.spec | |
| parent | 09115662e15ee83248e62465fead50be5ed85f79 (diff) | |
| download | kernel-81c4dc55f83517f99282c822fa0def3e308414b5.tar.gz kernel-81c4dc55f83517f99282c822fa0def3e308414b5.tar.xz kernel-81c4dc55f83517f99282c822fa0def3e308414b5.zip | |
Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 2cc619949..83f1b4c7d 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. @@ -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 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2215,6 +2215,9 @@ fi # ||----w | # || || %changelog +* Tue Nov 11 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.18.0-0.rc4.git0.2 +- Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4 + * Mon Nov 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - Fix Samsung pci-e SSD handling on some macbooks (rhbz 1161805) |