[kernel] r16499 - in dists/sid/linux-2.6/debian: . patches/bugfix/all/stable patches/series

[Ben Hutchings]

Author: benh
Date: Fri Oct 29 09:05:52 2010
New Revision: 16499

Log:
Add stable 2.6.32.25

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.25.patch
      - copied, changed from r16494, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.25-rc1.patch
Deleted:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.25-rc1.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/27

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Oct 29 09:04:28 2010	(r16498)
+++ dists/sid/linux-2.6/debian/changelog	Fri Oct 29 09:05:52 2010	(r16499)
@@ -3,7 +3,7 @@
   [ Ben Hutchings ]
   * rndis_host: Restrict fix for #576929 to specific devices
     (Closes: #589403, #600660)
-  * Add stable 2.6.32.25-rc1:
+  * Add stable 2.6.32.25:
     - rme9652: prevent reading uninitialized stack memory
     - ocfs2: Don't walk off the end of fast symlinks
     - ip: fix truesize mismatch in ip fragmentation

Copied and modified: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.25.patch (from r16494, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.25-rc1.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.25-rc1.patch	Wed Oct 27 11:25:22 2010	(r16494, copy source)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.25.patch	Fri Oct 29 09:05:52 2010	(r16499)
@@ -1,3 +1,5 @@
+diff --git a/Makefile b/Makefile
+index 83813cc..2b6c7bd 100644
 diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
 index c38afdb..0a3cf9e 100644
 --- a/arch/powerpc/kernel/head_64.S
@@ -495,51 +497,6 @@
  	dev_dbg(chan->device->common.dev, "%s, val 0x%08x\n", __func__, val);
  	__raw_writel(val, XOR_INTR_CAUSE(chan));
  }
-diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
-index 5852191..e8755b4 100644
---- a/drivers/hwmon/coretemp.c
-+++ b/drivers/hwmon/coretemp.c
-@@ -479,28 +479,20 @@ static int __init coretemp_init(void)
- 
- 	for_each_online_cpu(i) {
- 		struct cpuinfo_x86 *c = &cpu_data(i);
-+		/*
-+		* CPUID.06H.EAX[0] indicates whether the CPU has thermal
-+		* sensors. We check this bit only, all the early CPUs
-+		* without thermal sensors will be filtered out.
-+		*/
-+		if (c->cpuid_level >= 6 && (cpuid_eax(0x06) & 0x01)) {
-+			err = coretemp_device_add(i);
-+			if (err)
-+				goto exit_devices_unreg;
- 
--		/* check if family 6, models 0xe (Pentium M DC),
--		  0xf (Core 2 DC 65nm), 0x16 (Core 2 SC 65nm),
--		  0x17 (Penryn 45nm), 0x1a (Nehalem), 0x1c (Atom),
--		  0x1e (Lynnfield) */
--		if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
--		    !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
--			(c->x86_model == 0x16) || (c->x86_model == 0x17) ||
--			(c->x86_model == 0x1a) || (c->x86_model == 0x1c) ||
--			(c->x86_model == 0x1e))) {
--
--			/* supported CPU not found, but report the unknown
--			   family 6 CPU */
--			if ((c->x86 == 0x6) && (c->x86_model > 0xf))
--				printk(KERN_WARNING DRVNAME ": Unknown CPU "
--					"model %x\n", c->x86_model);
--			continue;
-+		} else {
-+			printk(KERN_INFO DRVNAME ": CPU (model=0x%x)"
-+				" has no thermal sensor.\n", c->x86_model);
- 		}
--
--		err = coretemp_device_add(i);
--		if (err)
--			goto exit_devices_unreg;
- 	}
- 	if (list_empty(&pdev_list)) {
- 		err = -ENODEV;
 diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
 index f7346a9..62a5ce5 100644
 --- a/drivers/i2c/busses/i2c-pca-isa.c

Modified: dists/sid/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/27	Fri Oct 29 09:04:28 2010	(r16498)
+++ dists/sid/linux-2.6/debian/patches/series/27	Fri Oct 29 09:05:52 2010	(r16499)
@@ -7,7 +7,7 @@
 - bugfix/all/alsa-prevent-heap-corruption-in-snd_ctl_new.patch
 - bugfix/all/rose-fix-signedness-issues-wrt-digi-count.patch
 - bugfix/all/phonet-disable-network-namespace-support.patch
-+ bugfix/all/stable/2.6.32.25-rc1.patch
++ bugfix/all/stable/2.6.32.25.patch
 + features/all/btrfs-add-a-df-ioctl-for-btrfs.patch
 + bugfix/all/e1000e-Reset-82577+82578-PHY-before-first-PHY-register-read.patch
 + bugfix/arm/kirkwood-reset-pcie.patch