[kernel] r16070 - in dists/sid/linux-2.6/debian: . patches/bugfix/all/stable
Ben Hutchings
benh at alioth.debian.org
Tue Aug 3 00:42:45 UTC 2010
Author: benh
Date: Tue Aug 3 00:42:43 2010
New Revision: 16070
Log:
Add stable 2.6.32.17 and 2.6.33.7
Added:
dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.17.patch
- copied, changed from r16068, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.17-rc1.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.7.patch
- copied, changed from r16068, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.7-rc1.patch
Deleted:
dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.17-rc1.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.7-rc1.patch
Modified:
dists/sid/linux-2.6/debian/changelog
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Tue Aug 3 00:41:54 2010 (r16069)
+++ dists/sid/linux-2.6/debian/changelog Tue Aug 3 00:42:43 2010 (r16070)
@@ -13,10 +13,10 @@
- Portugese (Américo Monteiro) (Closes: #590557)
- French (David Prévot) (Closes: #591149)
- Russian (Yuri Kozlov) (Closes: #591241)
- * Add stable 2.6.32.17-rc1
+ * Add stable 2.6.32.17:
- Fixes CVE-2010-2478
- Fixes CVE-2010-2525
- * Add drm changes from stable 2.6.33.7-rc1:
+ * Add drm changes from stable 2.6.33.7:
- drm/i915: Enable low-power render writes on GEN3 hardware (915, 945,
G33 and Atom "Pineview") (Closes: #590193, maybe others)
* [i386/xen-686] Remove AMD Geode LX and VIA C3 "Nehemiah" from the list
Copied and modified: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.17.patch (from r16068, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.17-rc1.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.17-rc1.patch Mon Aug 2 17:02:44 2010 (r16068, copy source)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.17.patch Tue Aug 3 00:42:43 2010 (r16070)
@@ -1,3 +1,5 @@
+diff --git a/Makefile b/Makefile
+index 9797439..2e357ce 100644
diff --git a/arch/arm/kernel/kprobes-decode.c b/arch/arm/kernel/kprobes-decode.c
index da1f949..8bccbfa 100644
--- a/arch/arm/kernel/kprobes-decode.c
Copied and modified: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.7.patch (from r16068, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.7-rc1.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.7-rc1.patch Mon Aug 2 17:02:44 2010 (r16068, copy source)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.7.patch Tue Aug 3 00:42:43 2010 (r16070)
@@ -1,3 +1,5 @@
+diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
+index 930664c..73bd7f4 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -328,6 +328,7 @@ int i965_reset(struct drm_device *dev, u8 flags)
@@ -8,6 +10,8 @@
return -ENODEV;
}
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index 4a44de4..8a41c4e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2288,8 +2288,9 @@ i915_gem_object_get_pages(struct drm_gem_object *obj,
@@ -38,6 +42,8 @@
/* Old X drivers will take 0-2 for front, back, depth buffers */
dev_priv->fence_reg_start = 3;
+diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
+index 30a2322..635d349 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -326,6 +326,70 @@
@@ -111,6 +117,8 @@
#define CACHE_MODE_0 0x02120 /* 915+ only */
#define CM0_MASK_SHIFT 16
#define CM0_IZ_OPT_DISABLE (1<<6)
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 3f00902..d63173a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -879,8 +879,8 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
@@ -124,6 +132,8 @@
found = false;
if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
+diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
+index c0d4650..3ecd236 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1384,6 +1384,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
@@ -221,6 +231,8 @@
static int r100_cs_track_texture_check(struct radeon_device *rdev,
struct r100_cs_track *track)
{
+diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
+index ff1e0cd..f890fd3 100644
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c
@@ -368,6 +368,8 @@ int r200_packet0_check(struct radeon_cs_parser *p,
@@ -256,6 +268,8 @@
break;
case R200_TXFORMAT_DXT1:
track->textures[i].cpp = 1;
+diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
+index 5bdfaf2..7e9868d 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -870,6 +870,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
@@ -292,6 +306,8 @@
break;
case R300_TX_FORMAT_DXT1:
track->textures[i].cpp = 1;
+diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
+index ff02664..e249933 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -268,6 +268,15 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
@@ -328,6 +344,8 @@
break;
case 2:
if (igp_info->info_2.ucMemoryType & 0x0f)
+diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
+index 2bdfbcd..c263f8e 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -779,30 +779,27 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connect
@@ -373,6 +391,8 @@
kfree(radeon_connector->edid);
radeon_connector->edid = NULL;
ret = connector_status_disconnected;
+diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+index 38e45e2..5c2672f 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -108,6 +108,7 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
@@ -383,6 +403,8 @@
break;
}
+diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
+index f2ed27c..0320403 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_tv.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
@@ -642,8 +642,8 @@ void radeon_legacy_tv_mode_set(struct drm_encoder *encoder,
More information about the Kernel-svn-changes
mailing list