Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc4.git3.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc4.git3.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc4.git3.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc4.git3.1.vanilla.knurd.1.fc22

4 files changed, 10 insertions, 62 deletions

diff --git a/0001-i915-fbc-Disable-on-HSW-by-default-for-now.patch b/0001-i915-fbc-Disable-on-HSW-by-default-for-now.patch
deleted file mode 100644
index 76e62be49..000000000
--- a/0001-i915-fbc-Disable-on-HSW-by-default-for-now.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0502ecec1ea91a205a0e7208334001f30664b526 Mon Sep 17 00:00:00 2001
-From: Fedora Kernel Team <kernel-team@fedoraproject.org>
-Date: Mon, 20 Jun 2016 14:52:10 +0200
-Subject: [PATCH] i915/fbc: Disable on HSW by default for now
-
-Upstream: posted on dri-devel (and r-b'd)
-
-Author:     cpaul@redhat.com <cpaul@redhat.com>
-AuthorDate: Thu Jun 9 11:58:15 2016 -0400
-Commit:     Rob Clark <rclark@redhat.com>
-CommitDate: Thu Jun 9 15:43:07 2016 -0400
-
-    i915/fbc: Disable on HSW by default for now
-
-    >From https://bugs.freedesktop.org/show_bug.cgi?id=96461 :
-
-    This was kind of a difficult bug to track down. If you're using a
-    Haswell system running GNOME and you have fbc completely enabled and
-    working, playing videos can result in video artifacts. Steps to
-    reproduce:
-
-    - Run GNOME
-    - Ensure FBC is enabled and active
-    - Download a movie, I used the ogg version of Big Buck Bunny for this
-    - Run `gst-launch-1.0 filesrc location='some_movie.ogg' ! decodebin !
-      glimagesink` in a terminal
-    - Watch for about over a minute, you'll see small horizontal lines go
-      down the screen.
-
-    For the time being, disable FBC for Haswell by default.
-
-    Signed-off-by: Lyude <cpaul@redhat.com>
-    Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
-    Cc: stable@vger.kernel.org
----
- drivers/gpu/drm/i915/intel_fbc.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
-index d5a7cfe..647127f 100644
---- a/drivers/gpu/drm/i915/intel_fbc.c
-+++ b/drivers/gpu/drm/i915/intel_fbc.c
-@@ -824,8 +824,7 @@ static bool intel_fbc_can_choose(struct intel_crtc *crtc)
- {
- 	struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
- 	struct intel_fbc *fbc = &dev_priv->fbc;
--	bool enable_by_default = IS_HASWELL(dev_priv) ||
--				 IS_BROADWELL(dev_priv);
-+	bool enable_by_default = IS_BROADWELL(dev_priv);
- 
- 	if (intel_vgpu_active(dev_priv->dev)) {
- 		fbc->no_fbc_reason = "VGPU is active";
--- 
-2.7.4
-
diff --git a/gitrev b/gitrev
index 3600cc5db..0f33c91cd 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-67016f6cdfd079e632bbc49e33178b2d558c120a
+63c04ee7d3b7c8d8e2726cb7c5f8a5f6fcc1e3b2
diff --git a/kernel.spec b/kernel.spec
index 6bcd694f2..d1951ac14 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 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -384,7 +384,7 @@ Requires: kernel-modules-uname-r = %{KVERREL}%{?variant}
 # List the packages used during the kernel build
 #
 BuildRequires: kmod, patch, bash, sh-utils, tar, git
-BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, make, diffutils, gawk
+BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
 BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc
 BuildRequires: net-tools, hostname, bc
 %if %{with_sparse}
@@ -644,9 +644,6 @@ Patch815: 0015-drm-i915-gen9-Calculate-watermarks-during-atomic-che.patch
 Patch816: 0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch
 Patch817: 0017-drm-i915-Remove-wm_config-from-dev_priv-intel_atomic.patch
 
-#other drm/kms fixes (most Cc-ed stable)
-Patch821: 0001-i915-fbc-Disable-on-HSW-by-default-for-now.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2175,6 +2172,12 @@ fi
 #
 # 
 %changelog
+* Fri Jun 24 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc4.git3.1
+- Linux v4.7-rc4-76-g63c04ee
+
+* Thu Jun 23 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc4.git2.1
+- Linux v4.7-rc4-20-gf9020d1
+
 * Wed Jun 22 2016 Hans de Goede <jwrdegoede@fedoraproject.org>
 - Bring in patch-series from drm-next to fix skl_update_other_pipe_wm issues
   (rhbz 1305038)
diff --git a/sources b/sources
index 56f5808ae..3cd2245da 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 d2927020e24a76da4ab482a8bc3e9ef3  linux-4.6.tar.xz
 fd23b14b9d474c3dfacb6e8ee82d3a51  perf-man-4.6.tar.gz
 bee81c135f2a8d4bfac7910eac744980  patch-4.7-rc4.xz
-793f2e654d4db65e13ac33f5700d710d  patch-4.7-rc4-git1.xz
+4ed9a7b05aa3a9b9a4ea4e6cb9de5d50  patch-4.7-rc4-git3.xz