summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2016-08-31 10:38:08 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2016-08-31 10:38:08 +0200
commit90e766cbfd90b51605c1c52edd82ce2e14cfe480 (patch)
tree37bc352518f8489189606fdf76a04fd699759bac /kernel.spec
parentace0ac76194fee56f707e3ad93335de48d9454b3 (diff)
parenta5b5f8c65c832e46d54bdbc6afbf4bb60f9c6679 (diff)
downloadkernel-90e766cbfd90b51605c1c52edd82ce2e14cfe480.tar.gz
kernel-90e766cbfd90b51605c1c52edd82ce2e14cfe480.tar.xz
kernel-90e766cbfd90b51605c1c52edd82ce2e14cfe480.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec26
1 files changed, 18 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index edc97298d..2cf0fb99f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -622,15 +622,15 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
#rhbz 1200901 (There should be something better upstream at some point)
Patch842: qxl-reapply-cursor-after-SetCrtc-calls.patch
-#CVE-2016-6828 rhbz 1367091,1367092
-Patch843: tcp-fix-use-after-free-in-tcp_xmit_retransmit_queue.patch
-
-#rhbz 1365940
-Patch844: 0001-udp-fix-poll-issue-with-zero-sized-packets.patch
-
# From kernel list, currently in linux-next
Patch845: HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch
+# SELinux OverlayFS support (queued for 4.9)
+Patch846: security-selinux-overlayfs-support.patch
+
+#rhbz 1360688
+Patch847: rc-core-fix-repeat-events.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2170,6 +2170,16 @@ fi
#
#
%changelog
+* Tue Aug 30 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc4.git1.1
+- Linux v4.8-rc4-119-ge4e98c4
+
+* Mon Aug 29 2016 Laura Abbott <labbott@fedoraproject.org>
+- Add event decoding fix (rhbz 1360688)
+
+* Mon Aug 29 2016 Justin M. Forbes <jforbes@fedoraproject.org>
+- Reenable debugging options.
+- Add SELinux OverlayFS support.
+
* Mon Aug 29 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc4.git0.1
- Disable debugging options.
- Linux v4.8-rc4