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

[maximilian attems]

Author: maks-guest
Date: Thu Dec 28 23:01:34 2006
New Revision: 8046

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.33
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
add oepn 2.6.16.33 fixes


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Dec 28 23:01:34 2006
@@ -46,6 +46,10 @@
   * m68k/atari: fixes for ethernec and video driver by Michael Schmitz
 
   [ maximilian attems ]
+  * Hand-picked from stable release 2.6.16.33:
+    - Add new PHY to sis900 supported list
+    - ipmi_si_intf.c: fix "&& 0xff" typos
+    - drivers/scsi/psi240i.c: fix an array overrun
   * Hand-picked from stable release 2.6.16.34:
     - [IPX]: Annotate and fix IPX checksum
     - [IGMP]: Fix IGMPV3_EXP() normalization bit shift value.
@@ -71,7 +75,7 @@
     - softirq: remove BUG_ONs which can incorrectly trigger
     - Fix SUNRPC wakeup/execute race condition
 
- -- maximilian attems <maks at sternwelten.at>  Thu, 28 Dec 2006 22:54:32 +0100
+ -- maximilian attems <maks at sternwelten.at>  Thu, 28 Dec 2006 22:59:05 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.33
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.33	Thu Dec 28 23:01:34 2006
@@ -0,0 +1,56 @@
+diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
+index e59b638..fd63716 100644
+--- a/drivers/char/ipmi/ipmi_si_intf.c
++++ b/drivers/char/ipmi/ipmi_si_intf.c
+@@ -1284,7 +1284,7 @@ static void intf_mem_outb(struct si_sm_i
+ static unsigned char intf_mem_inw(struct si_sm_io *io, unsigned int offset)
+ {
+ 	return (readw((io->addr)+(offset * io->regspacing)) >> io->regshift)
+-		&& 0xff;
++		& 0xff;
+ }
+ 
+ static void intf_mem_outw(struct si_sm_io *io, unsigned int offset,
+@@ -1296,7 +1296,7 @@ static void intf_mem_outw(struct si_sm_i
+ static unsigned char intf_mem_inl(struct si_sm_io *io, unsigned int offset)
+ {
+ 	return (readl((io->addr)+(offset * io->regspacing)) >> io->regshift)
+-		&& 0xff;
++		& 0xff;
+ }
+ 
+ static void intf_mem_outl(struct si_sm_io *io, unsigned int offset,
+@@ -1309,7 +1309,7 @@ static void intf_mem_outl(struct si_sm_i
+ static unsigned char mem_inq(struct si_sm_io *io, unsigned int offset)
+ {
+ 	return (readq((io->addr)+(offset * io->regspacing)) >> io->regshift)
+-		&& 0xff;
++		& 0xff;
+ }
+ 
+ static void mem_outq(struct si_sm_io *io, unsigned int offset,
+diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
+index 7a952fe..f185b4c 100644
+--- a/drivers/net/sis900.c
++++ b/drivers/net/sis900.c
+@@ -134,6 +134,7 @@ static struct mii_chip_info {
+ 	{ "AMD 79C901 10BASE-T PHY",  		0x0000, 0x6B70, LAN },
+ 	{ "AMD 79C901 HomePNA PHY",		0x0000, 0x6B90, HOME},
+ 	{ "ICS LAN PHY",			0x0015, 0xF440, LAN },
++	{ "ICS LAN PHY",			0x0143, 0xBC70, LAN },
+ 	{ "NS 83851 PHY",			0x2000, 0x5C20, MIX },
+ 	{ "NS 83847 PHY",                       0x2000, 0x5C30, MIX },
+ 	{ "Realtek RTL8201 PHY",		0x0000, 0x8200, LAN },
+diff --git a/drivers/scsi/psi240i.c b/drivers/scsi/psi240i.c
+index 5c2cdf5..76972b4 100644
+--- a/drivers/scsi/psi240i.c
++++ b/drivers/scsi/psi240i.c
+@@ -329,7 +329,7 @@ static void Irq_Handler (int irq, void *
+ 				pinquiryData->AdditionalLength = 35 - 4;
+ 
+ 				// Fill in vendor identification fields.
+-				for ( z = 0;  z < 20;  z += 2 )
++				for ( z = 0;  z < 8;  z += 2 )
+ 					{
+ 					pinquiryData->VendorId[z]	  = ((UCHAR *)identifyData.ModelNumber)[z + 1];
+ 					pinquiryData->VendorId[z + 1] = ((UCHAR *)identifyData.ModelNumber)[z];

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	(original)
+++ dists/sid/linux-2.6/debian/patches/series/9	Thu Dec 28 23:01:34 2006
@@ -16,6 +16,7 @@
 + bugfix/mincore-hang.patch
 + bugfix/mincore-error-value-cases.patch
 + bugfix/mincore-typo.patch
++ bugfix/2.6.16.33
 + bugfix/2.6.16.34
 + bugfix/2.6.16.35
 + bugfix/2.6.16.36