Linux 3.1-rc4

3 files changed, 6 insertions, 50 deletions

diff --git a/fix-intel-duplicate-backlight.patch b/fix-intel-duplicate-backlight.patch
deleted file mode 100644
index c33e92ec2..000000000
--- a/fix-intel-duplicate-backlight.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From:	Kamal Mostafa <kamal@canonical.com>
-To:	Linux Kernel <linux-kernel@vger.kernel.org>,
-	intel-gfx@lists.freedesktop.org
-Cc:	Matthew Garrett <mjg@redhat.com>,
-	Keith Packard <keithp@keithp.com>,
-	Kamal Mostafa <kamal@canonical.com>
-Subject: [PATCH] i915: do not setup intel_backlight twice
-Date:	Mon, 22 Aug 2011 12:39:10 -0700
-Message-Id: <1314041950-12433-1-git-send-email-kamal@canonical.com>
-X-Mailer: git-send-email 1.7.4.1
-In-Reply-To: <20110817141010.GA21479@redhat.com>
-References: <20110817141010.GA21479@redhat.com>
-Sender:	linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List:	linux-kernel@vger.kernel.org
-
-The commit "Not all systems expose a firmware or platform mechanism for
-changing the backlight intensity on i915, so add native driver support"
-adds calls to  intel_panel_setup_backlight() from intel_{lvds,dp}_init
-so do not call it again from intel_setup_outputs().
-
-BugLink: http://bugs.launchpad.net/bugs/831542
-
-Signed-off-by: Kamal Mostafa <kamal@canonical.com>
----
- drivers/gpu/drm/i915/intel_display.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index ee1d701..5a1ae9f 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -7238,8 +7238,6 @@ static void intel_setup_outputs(struct drm_device *dev)
- 			intel_encoder_clones(dev, encoder->clone_mask);
- 	}
- 
--	intel_panel_setup_backlight(dev);
--
- 	/* disable all the possible outputs/crtcs before entering KMS mode */
- 	drm_helper_disable_unused_functions(dev);
- }
--- 
-1.7.4.1
diff --git a/kernel.spec b/kernel.spec
index b7f45f696..dd9581b77 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -82,9 +82,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 3
+%define rcrev 4
 # The git snapshot level
-%define gitrev 6
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -713,7 +713,6 @@ Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
 Patch12026: block-stray-block-put-after-teardown.patch
 Patch12027: usb-add-quirk-for-logitech-webcams.patch
 Patch12029: crypto-register-cryptd-first.patch
-Patch12030: fix-intel-duplicate-backlight.patch
 
 Patch12303: dmar-disable-when-ricoh-multifunction.patch
 
@@ -1316,7 +1315,6 @@ ApplyPatch block-stray-block-put-after-teardown.patch
 ApplyPatch usb-add-quirk-for-logitech-webcams.patch
 
 ApplyPatch crypto-register-cryptd-first.patch
-ApplyPatch fix-intel-duplicate-backlight.patch
 
 # rhbz#605888
 ApplyPatch dmar-disable-when-ricoh-multifunction.patch
@@ -2035,6 +2033,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Aug 29 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-rc4
+
 * Sat Aug 27 2011 Dave Jones <davej@redhat.com>
 - Fix get_gate_vma usage in i386 NX emulation
 - Bring back the 32bit mmap randomization patch for now.
diff --git a/sources b/sources
index f3e4c54c5..5958093ad 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
-b9a15f79846c4d01fa3019a3112a8d04  patch-3.1-rc3.bz2
-84eae25e508548a5727493f72a28a582  patch-3.1-rc3-git6.bz2
+0b0f625fd2d97699e5dbf71554373e6b  patch-3.1-rc4.bz2