[kernel] r19259 - dists/squeeze/linux-2.6/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Mon Jul 16 01:42:05 2012
New Revision: 19259

Log:
Remove 'upstream' references to 2.6.32+drm33; 'upstream' means mainline

Modified:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Implement-fair-lru-eviction-across-both-rin.patch
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Maintain-LRU-order-of-inactive-objects-upon.patch
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Move-the-eviction-logic-to-its-own-file.patch
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Periodically-flush-the-active-lists-and-req.patch
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-evict-Ensure-we-completely-cleanup-on-failu.patch
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-prepare-for-fair-lru-eviction.patch
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-implement-helper-functions-for-scanning-lru-list.patch
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm_mm-extract-check_free_mm_node.patch

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Implement-fair-lru-eviction-across-both-rin.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Implement-fair-lru-eviction-across-both-rin.patch	Mon Jul 16 01:35:23 2012	(r19258)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Implement-fair-lru-eviction-across-both-rin.patch	Mon Jul 16 01:42:05 2012	(r19259)
@@ -2,8 +2,6 @@
 Date: Fri, 17 Jun 2011 10:04:21 -0500
 Subject: [PATCH 05/10] drm/i915: Implement fair lru eviction across both rings. (v2)
 
-commit f42384c96e7e53c42615b16396c47edf40667b72 upstream.
-
 BugLink: http://bugs.launchpad.net/bugs/599017
 
 Based in a large part upon Daniel Vetter's implementation and adapted

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Maintain-LRU-order-of-inactive-objects-upon.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Maintain-LRU-order-of-inactive-objects-upon.patch	Mon Jul 16 01:35:23 2012	(r19258)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Maintain-LRU-order-of-inactive-objects-upon.patch	Mon Jul 16 01:42:05 2012	(r19259)
@@ -2,8 +2,6 @@
 Date: Fri, 17 Jun 2011 10:04:22 -0500
 Subject: [PATCH 06/10] drm/i915: Maintain LRU order of inactive objects upon access by CPU (v2)
 
-commit f8fd3ab5b8bf8f99ea13ebbecabd5c8e42c82948 upstream.
-
 BugLink: http://bugs.launchpad.net/bugs/599017
 
 In order to reduce the penalty of fallbacks under memory pressure and to

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Move-the-eviction-logic-to-its-own-file.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Move-the-eviction-logic-to-its-own-file.patch	Mon Jul 16 01:35:23 2012	(r19258)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Move-the-eviction-logic-to-its-own-file.patch	Mon Jul 16 01:42:05 2012	(r19259)
@@ -2,8 +2,6 @@
 Date: Fri, 17 Jun 2011 10:04:21 -0500
 Subject: [PATCH 04/10] drm/i915: Move the eviction logic to its own file.
 
-commit cf9ec16fcec6fcb0a0ae6d5bcd3f34ff348c683e upstream.
-
 BugLink: http://bugs.launchpad.net/bugs/599017
 
 The eviction code is the gnarly underbelly of memory management, and is

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Periodically-flush-the-active-lists-and-req.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Periodically-flush-the-active-lists-and-req.patch	Mon Jul 16 01:35:23 2012	(r19258)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-Periodically-flush-the-active-lists-and-req.patch	Mon Jul 16 01:42:05 2012	(r19259)
@@ -2,8 +2,6 @@
 Date: Fri, 17 Jun 2011 10:04:22 -0500
 Subject: [PATCH 08/10] drm/i915: Periodically flush the active lists and requests
 
-commit 41516474bc14ea128b05bf65c9cbdb04739582ac upstream.
-
 BugLink: http://bugs.launchpad.net/bugs/599017
 
 In order to retire active buffers whilst no client is active, we need to

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-evict-Ensure-we-completely-cleanup-on-failu.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-evict-Ensure-we-completely-cleanup-on-failu.patch	Mon Jul 16 01:35:23 2012	(r19258)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-evict-Ensure-we-completely-cleanup-on-failu.patch	Mon Jul 16 01:42:05 2012	(r19259)
@@ -2,8 +2,6 @@
 Date: Fri, 17 Jun 2011 10:04:22 -0500
 Subject: [PATCH 07/10] drm/i915/evict: Ensure we completely cleanup on failure
 
-commit 2f4f8bc3da84232a25e0ced165d4bb5643d3aaad upstream.
-
 BugLink: http://bugs.launchpad.net/bugs/599017
 
 ... and not leave the objects in a inconsistent state.

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-prepare-for-fair-lru-eviction.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-prepare-for-fair-lru-eviction.patch	Mon Jul 16 01:35:23 2012	(r19258)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-prepare-for-fair-lru-eviction.patch	Mon Jul 16 01:42:05 2012	(r19259)
@@ -2,8 +2,6 @@
 Date: Fri, 17 Jun 2011 10:04:20 -0500
 Subject: [PATCH 03/10] drm/i915: prepare for fair lru eviction
 
-commit f07147fcefea6d203882c570d61bdf73dd25ae66 upstream.
-
 BugLink: http://bugs.launchpad.net/bugs/599017
 
 This does two little changes:

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-implement-helper-functions-for-scanning-lru-list.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-implement-helper-functions-for-scanning-lru-list.patch	Mon Jul 16 01:35:23 2012	(r19258)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-implement-helper-functions-for-scanning-lru-list.patch	Mon Jul 16 01:42:05 2012	(r19259)
@@ -2,8 +2,6 @@
 Date: Fri, 17 Jun 2011 10:04:20 -0500
 Subject: [PATCH 02/10] drm: implement helper functions for scanning lru list
 
-commit be54bbcaee8559cc412b5e4abc8eb33388b083e0 upstream.
-
 BugLink: http://bugs.launchpad.net/bugs/599017
 
 These helper functions can be used to efficiently scan lru list

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm_mm-extract-check_free_mm_node.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm_mm-extract-check_free_mm_node.patch	Mon Jul 16 01:35:23 2012	(r19258)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm_mm-extract-check_free_mm_node.patch	Mon Jul 16 01:42:05 2012	(r19259)
@@ -2,8 +2,6 @@
 Date: Fri, 17 Jun 2011 10:04:19 -0500
 Subject: [PATCH 01/10] drm_mm: extract check_free_mm_node
 
-commit d4a82251610c863bab7f457cb7a76a4bf01abb21 upstream.
-
 BugLink: http://bugs.launchpad.net/bugs/599017
 
 There are already two copies of this logic. And the new scanning