summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-05-18 08:28:46 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-05-18 08:32:30 -0700
commitaf495309bb553b4659f08470ac94fedf74b3845a (patch)
treef540f17c8dea7042a98db7f6b1d6729817829d27 /kernel.spec
parent3856ef7eb1db56671e00a069af6c0614c6b21c7f (diff)
downloadkernel-af495309bb553b4659f08470ac94fedf74b3845a.tar.gz
kernel-af495309bb553b4659f08470ac94fedf74b3845a.tar.xz
kernel-af495309bb553b4659f08470ac94fedf74b3845a.zip
Linux v4.6-3623-g0b7962a
ata, regulator, gpio, HID, livepatching, networking, dm, block, vfs, fs, timers, crypto merges
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 8941c6ae1..2e9416cae 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 2
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -606,9 +606,6 @@ Patch641: disable-CONFIG_EXPERT-for-ZONE_DMA.patch
#CVE-2016-3134 rhbz 1317383 1317384
Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
-#rhbz 1309487
-Patch701: antenna_select.patch
-
#CVE-2016-4482 rhbz 1332931 1332932
Patch706: USB-usbfs-fix-potential-infoleak-in-devio.patch
@@ -2145,6 +2142,11 @@ fi
#
#
%changelog
+* Wed May 18 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git3.1
+- Linux v4.6-3623-g0b7962a
+- ata, regulator, gpio, HID, livepatching, networking, dm, block, vfs, fs,
+ timers, crypto merges
+
* Tue May 17 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git2.2
- Adjust solib for cpupower