[kernel/f17] Linux v3.4.2
Josh Boyer
jwboyer at fedoraproject.org
Sat Jun 9 18:25:20 UTC 2012
commit ab7183ff44826627bbdc6ef461bb2de6473ee4e4
Author: Josh Boyer <jwboyer at redhat.com>
Date: Sat Jun 9 14:25:14 2012 -0400
Linux v3.4.2
drm-i915-dp-stfu.patch | 36 ++----
hugetlb-fix-resv_map-leak-in-error-path.patch | 176 -------------------------
kernel.spec | 13 +-
sources | 2 +-
4 files changed, 16 insertions(+), 211 deletions(-)
---
diff --git a/drm-i915-dp-stfu.patch b/drm-i915-dp-stfu.patch
index 8948229..c005a06 100644
--- a/drm-i915-dp-stfu.patch
+++ b/drm-i915-dp-stfu.patch
@@ -1,21 +1,8 @@
-From 04a43e2598db35b3d0ec25925bb8475b5c0a3809 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Fri, 16 Mar 2012 16:39:11 -0400
-Subject: [PATCH] drm/i915/dp: Use DRM_ERROR not WARN for sanity checks
-
-These are noisy as shit and creating a ton of abrt reports. I don't
-need more, thanks. Proper fix upstream eventually.
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
- drivers/gpu/drm/i915/intel_dp.c | 14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
-
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 94f860c..6bf27c9 100644
+index 296cfc2..516e1e2 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -331,7 +331,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
+@@ -350,7 +350,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
if (!is_edp(intel_dp))
return;
if (!ironlake_edp_have_panel_power(intel_dp) && !ironlake_edp_have_panel_vdd(intel_dp)) {
@@ -24,7 +11,7 @@ index 94f860c..6bf27c9 100644
DRM_DEBUG_KMS("Status 0x%08x Control 0x%08x\n",
I915_READ(PCH_PP_STATUS),
I915_READ(PCH_PP_CONTROL));
-@@ -386,7 +386,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
+@@ -400,7 +400,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
}
if (try == 3) {
@@ -33,7 +20,7 @@ index 94f860c..6bf27c9 100644
I915_READ(ch_ctl));
return -EBUSY;
}
-@@ -992,8 +992,8 @@ static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
+@@ -1024,8 +1024,8 @@ static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
return;
DRM_DEBUG_KMS("Turn eDP VDD on\n");
@@ -44,7 +31,7 @@ index 94f860c..6bf27c9 100644
intel_dp->want_panel_vdd = true;
-@@ -1058,7 +1058,8 @@ static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
+@@ -1090,7 +1090,8 @@ static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
return;
DRM_DEBUG_KMS("Turn eDP VDD off %d\n", intel_dp->want_panel_vdd);
@@ -54,16 +41,13 @@ index 94f860c..6bf27c9 100644
intel_dp->want_panel_vdd = false;
-@@ -1128,7 +1129,8 @@ static void ironlake_edp_panel_off(struct intel_dp *intel_dp)
+@@ -1160,7 +1161,8 @@ static void ironlake_edp_panel_off(struct intel_dp *intel_dp)
DRM_DEBUG_KMS("Turn eDP power off\n");
-- WARN(intel_dp->want_panel_vdd, "Cannot turn power off while VDD is on\n");
-+ if (intel_dp->want_panel_vdd)
-+ DRM_ERROR("Cannot turn power off while VDD is on\n");
+- WARN(!intel_dp->want_panel_vdd, "Need VDD to turn off panel\n");
++ if (!intel_dp->want_panel_vdd)
++ DRM_ERROR("Need VDD to turn off panel\n");
pp = ironlake_get_pp_control(dev_priv);
- pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET | EDP_BLC_ENABLE);
---
-1.7.7.6
-
+ pp &= ~(POWER_TARGET_ON | PANEL_POWER_RESET | EDP_BLC_ENABLE);
diff --git a/kernel.spec b/kernel.spec
index aaec35a..f132855 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,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 3
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -66,7 +66,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -769,9 +769,6 @@ Patch22019: rtl818x-fix-sleeping-function-called-from-invalid-context.patch
#rhbz 822825 822821 CVE-2012-2372
Patch22021: mm-pmd_read_atomic-fix-32bit-PAE-pmd-walk-vs-pmd_populate-SMP-race-condition.patch
-#rhbz 824352 824345 CVE-2012-2390
-Patch22022: hugetlb-fix-resv_map-leak-in-error-path.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -1481,9 +1478,6 @@ ApplyPatch rtl818x-fix-sleeping-function-called-from-invalid-context.patch
#rhbz 822825 822821 CVE-2012-2372
ApplyPatch mm-pmd_read_atomic-fix-32bit-PAE-pmd-walk-vs-pmd_populate-SMP-race-condition.patch
-#rhbz 824352 824345 CVE-2012-2390
-ApplyPatch hugetlb-fix-resv_map-leak-in-error-path.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2338,6 +2332,9 @@ fi
# '-' | |
# '-'
%changelog
+* Sat Jun 09 2012 Josh Boyer <jwboyer at redhat.com> 3.4.2-1
+- Linux v3.4.2
+
* Fri Jun 08 2012 Josh Boyer <jwboyer at redhat.com>
- Enable HV assisted KVM on ppc64
diff --git a/sources b/sources
index 425eaf4..cd36471 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
967f72983655e2479f951195953e8480 linux-3.4.tar.xz
-52adc59c547c4c7926686145b9ade5f1 patch-3.4.1.xz
+ac52d3d82c20c7e80740fc5fb00b6ed4 patch-3.4.2.xz
More information about the scm-commits
mailing list