summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2014-11-17 13:37:29 -0500
committerKyle McMartin <kmcmarti@redhat.com>2014-11-17 13:37:29 -0500
commit94b9cdb4e60eceaf54ec00f54292733abdc5fd44 (patch)
treee09ba8bedc769cd16e54c626059147dde69ca5da /kernel.spec
parent56722effff20df2ca33f2e42412530222c58b2b4 (diff)
downloadkernel-94b9cdb4e60eceaf54ec00f54292733abdc5fd44.tar.gz
kernel-94b9cdb4e60eceaf54ec00f54292733abdc5fd44.tar.xz
kernel-94b9cdb4e60eceaf54ec00f54292733abdc5fd44.zip
Re-merge kernel-arm64.patch
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 06c0e41ac..dbf87e242 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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
@@ -2205,6 +2205,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Nov 17 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.18.0-0.rc5.git0.2
+- Re-merge kernel-arm64.patch
+
* Mon Nov 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc5.git0.1
- Linux v3.18-rc5
- Disable debugging options.