[kernel/f20] Linux v3.15.4

[Justin M. Forbes]

commit 6d252143b7f7cf4ae62fbf70e7e2fcec4860a7f8
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Mon Jul 7 08:54:19 2014 -0500

    Linux v3.15.4

 ...opulate-net-in-mount-data-when-remounting.patch |   39 ----------
 ...al-with-clickpads-reporting-right-button-.patch |   79 --------------------
 kernel.spec                                        |   19 ++---
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 132 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 9f5cfbf..0f35227 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -74,7 +74,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -736,15 +736,9 @@ Patch25096: drm-i915-set-backlight-duty-cycle-after-backlight-enable-for-gen4.pa
 #rhbz 1064516
 Patch25098: e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
 
-#rhbz 1099761
-Patch25099: NFS-populate-net-in-mount-data-when-remounting.patch
-
 #rhbz 1106856
 Patch25100: dm-thin-update-discard_granularity-to-reflect-the-thin-pool-blocksize.patch
 
-#rhbz 1103528
-Patch25101: elantech-Deal-with-clickpads-reporting-right-button-.patch
-
 Patch25102: intel_pstate-Fix-setting-VID.patch
 Patch25103: intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
 Patch25104: intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
@@ -1458,15 +1452,9 @@ ApplyPatch drm-i915-set-backlight-duty-cycle-after-backlight-enable-for-gen4.pat
 #rhbz 1064516
 ApplyPatch e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
 
-#rhbz 1099761
-ApplyPatch NFS-populate-net-in-mount-data-when-remounting.patch
-
 #rhbz 1106856
 ApplyPatch dm-thin-update-discard_granularity-to-reflect-the-thin-pool-blocksize.patch
 
-#rhbz 1103528
-ApplyPatch elantech-Deal-with-clickpads-reporting-right-button-.patch
-
 ApplyPatch intel_pstate-Fix-setting-VID.patch
 ApplyPatch intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
 ApplyPatch intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
@@ -2296,6 +2284,11 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jul  7 2014 Justin M. Forbes <jforbes at fedoraproject.org> 3.15.4-200
+- Linux v3.15.4
+- Fixes CVE-2014-4715 (rhbz 1115767 1116362)
+- Fixes CVE-2014-4699 (rhbz 1115927 1116477)
+
 * Tue Jul  1 2014 Justin M. Forbes <jforbes at fedoraproject.org> 3.15.3-200
 - Linux v3.15.3
 - drm/i915: Fix backlight regression caused by misconfigured VBT
diff --git a/sources b/sources
index 25efe2a..d90de9e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 97ca1625bb40368dc41b9a7971549071  linux-3.15.tar.xz
-a2057d9b11f013482e2a7072552f3f02  patch-3.15.3.xz
+c0ecbe6a65913273c3338be7218dcf58  patch-3.15.4.xz