[kernel] r16728 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/arm patches/bugfix/mips patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Wed Dec 22 02:13:49 2010
New Revision: 16728

Log:
Update to 2.6.37-rc7

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/mips-Add-the-necessary-parameter-to-mips_sc_is_activ.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/mips-Change-mips_sc_is_activated-to-do-what-the-comm.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/mips-Restore-dma_cache_sync.patch
   dists/trunk/linux-2.6/debian/patches/debian/alpha-Do-not-use-Werror-for-arch-alpha-kernel.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.3
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.4
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Dec 20 23:21:41 2010	(r16727)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Dec 22 02:13:49 2010	(r16728)
@@ -1,4 +1,7 @@
-linux-2.6 (2.6.37~rc5-1~experimental.4) UNRELEASED; urgency=low
+linux-2.6 (2.6.37~rc7-1~experimental.1) UNRELEASED; urgency=low
+
+  * New upstream release candidate
+    - [mips] Rename mips_dma_cache_sync back to dma_cache_sync (fixes FTBFS)
 
   [ Ben Hutchings ]
   * debian/copyright: Add explanation of indirect linking of perf to
@@ -6,7 +9,6 @@
   * [powerpc,x86] Enable PATA_PCMCIA (Closes: #606324)
   * Disable BLK_DEV_IDECS
   * [alpha] Use libata-based drivers for most PATA controllers
-  * [mips] Restore dma_cache_sync() (fix yet another FTBFS)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 11 Dec 2010 21:21:10 +0000
 

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch	Mon Dec 20 23:21:41 2010	(r16727)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch	Wed Dec 22 02:13:49 2010	(r16728)
@@ -1,4 +1,3 @@
-From b31595992e52f94bd87c122dfad9cc37f15f82dc Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben at decadent.org.uk>
 Date: Sun, 28 Nov 2010 23:46:46 +0000
 Subject: [PATCH] dm: Deal with merge_bvec_fn in component devices better
@@ -22,14 +21,9 @@
 
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
- drivers/md/dm-table.c |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
-index 90267f8..776734d 100644
 --- a/drivers/md/dm-table.c
 +++ b/drivers/md/dm-table.c
-@@ -511,15 +511,15 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
+@@ -511,14 +511,15 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
  		       (unsigned long long) start << SECTOR_SHIFT);
  
  	/*
@@ -46,12 +40,8 @@
 +	}
  
 -	if (q->merge_bvec_fn && !ti->type->merge)
--		limits->max_sectors =
--			min_not_zero(limits->max_sectors,
--				     (unsigned int) (PAGE_SIZE >> 9));
+-		blk_limits_max_hw_sectors(limits,
+-					  (unsigned int) (PAGE_SIZE >> 9));
  	return 0;
  }
  EXPORT_SYMBOL_GPL(dm_set_device_limits);
--- 
-1.7.2.3
-

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Mon Dec 20 23:21:41 2010	(r16727)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Wed Dec 22 02:13:49 2010	(r16728)
@@ -41,6 +41,6 @@
 + bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
 + features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
 
-+ debian/alpha-Do-not-use-Werror-for-arch-alpha-kernel.patch
-+ bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions.patch
-+ bugfix/mips/mips-Add-the-necessary-parameter-to-mips_sc_is_activ.patch
++ bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions-2.patch
++ debian/alpha-Do-not-use-Werror-for-arch-alpha.patch
++ bugfix/all/drm-nouveau-Only-select-ACPI_VIDEO-if-its-dependenci.patch