[arch-commits] CVS update of arch/build/kernels/kernel26 (6 files)

Tobias Powalowski tpowa at archlinux.org
Fri May 25 17:39:32 UTC 2007 

    Date: Friday, May 25, 2007 @ 13:39:32
  Author: tpowa
    Path: /home/cvs-arch/arch/build/kernels/kernel26

Modified: PKGBUILD (1.225 -> 1.226) config (1.97 -> 1.98)
 Removed: alsa-2.6.21.patch.bz2 (1.4) alsa-20070506.patch.bz2 (1.1)
          revert_sky2.patch (1.1) sis900.patch (1.1)

'upgpkg: update to new version'


-------------------------+
 PKGBUILD                |   60 +++++++++++++++++++++++-----------------------
 alsa-2.6.21.patch.bz2   |    <<Binary file>>
 alsa-20070506.patch.bz2 |    <<Binary file>>
 config                  |   14 ++++++----
 revert_sky2.patch       |   34 --------------------------
 sis900.patch            |   53 ----------------------------------------
 6 files changed, 40 insertions(+), 123 deletions(-)


Index: arch/build/kernels/kernel26/PKGBUILD
diff -u arch/build/kernels/kernel26/PKGBUILD:1.225 arch/build/kernels/kernel26/PKGBUILD:1.226
--- arch/build/kernels/kernel26/PKGBUILD:1.225	Sun May  6 16:12:02 2007
+++ arch/build/kernels/kernel26/PKGBUILD	Fri May 25 13:39:31 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.225 2007/05/06 20:12:02 andyrtr Exp $
+# $Id: PKGBUILD,v 1.226 2007/05/25 17:39:31 tpowa Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=kernel26
 _basekernel=2.6.21
-pkgver=2.6.21.1
-pkgrel=8
+pkgver=2.6.21.3
+pkgrel=1
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 url="http://www.kernel.org"
@@ -33,29 +33,36 @@
         mactel-linux-2.6.21.patch
         coretemp.patch
 	atkbd.patch
-	alsa-20070506.patch.bz2
-	alsa-include.patch.bz2
-	patch_realtek.patch
-	sis900.patch
+	http://www.archlinux.org/~tpowa/alsa-patches/alsa-20070524.patch.bz2
+	http://www.archlinux.org/~tpowa/alsa-patches/alsa-include-20070524.patch.bz2
 	zd1211.patch
 	acpi-buggy-bios.patch
 	bluetooth-alsa.patch
-	revert_sky2.patch
 	http://heanet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.2-r2.tar.gz
 	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-2.x/linux-2.6.21-u2.diff.gz)
-md5sums=('1b515f588078dfa7f4bab2634bd17e80' 'c4c368f173af267a564948065ffc1689'\
-         'dd0ab2770aa77868a0ca73822daecdfe' '707321291b9b4a9aab3e63a1ddd3de5f'\
-         '5a62bcc7e96601052c7405459b483826' 'ed6b42fea2f5d27f7eb920746ccc1ebb'\
-         'a995ec849ea43d3c89d607bbdd1e7d09' '2365779022389399c5c705004cdbc583'\
-         '36858bd6a0bca63d2aa901b2e42d4a05' '493137566bc397ec762c86e64bd96849'\
-         '695d8578a0334fa9bb140917561f03d4' 'f6978eca251dfca21ffa46f1169583a4'\
-         '3ed791c3af3099489faf0d22cbcc55a8' '55e6fb0b0778db4ffea45c75565e1f28'\
-         '197453581bf03bd8f6cb50a4cbcc8685' '3f72c692c7c9cf596680bc3ce0cb84ec'\
-         '9db585806016b338a11886b2cbba84de' '5e00933ee60f7e1af44225e785de6820'\
-         '00bc768e40b48bbbcea4466289af29fc' 'f0c3200fde468a1ed37b363f0fb60c9c'\
-         'bec19952e53d01fc5f4e6f48ce3fa856' 'bbc730a590d4e09b3d937b257e5a4bfe'\
-         'b68adb3c52eeff2d441ca41c380382b7' '34980076fbd8e745d9345b42f6457fa4'\
-         'bf360b92eba9e6d5610196ce2e02fcd1' '4964894a3f406d600226b62de570605b')
+md5sums=('1b515f588078dfa7f4bab2634bd17e80'
+         'f7057a8dff173a6665fd61b69ed54a12'
+         '880c013921e75da777afb1cb2eaf4d25'
+         '733345b4a7390cc32dec42c0fe4d494f'
+         '5a62bcc7e96601052c7405459b483826'
+         'ed6b42fea2f5d27f7eb920746ccc1ebb'
+         'a995ec849ea43d3c89d607bbdd1e7d09'
+         '2365779022389399c5c705004cdbc583'
+         '36858bd6a0bca63d2aa901b2e42d4a05'
+         '493137566bc397ec762c86e64bd96849'
+         '695d8578a0334fa9bb140917561f03d4'
+         'f6978eca251dfca21ffa46f1169583a4'
+         '3ed791c3af3099489faf0d22cbcc55a8'
+         '55e6fb0b0778db4ffea45c75565e1f28'
+         '197453581bf03bd8f6cb50a4cbcc8685'
+         '3f72c692c7c9cf596680bc3ce0cb84ec'
+         '0d141e2863004c014e16c867926655e4'
+         '5fdc90e1f0557e881aa2b5a654b79899'
+         'bec19952e53d01fc5f4e6f48ce3fa856'
+         'bbc730a590d4e09b3d937b257e5a4bfe'
+         'b68adb3c52eeff2d441ca41c380382b7'
+         'bf360b92eba9e6d5610196ce2e02fcd1'
+         '4964894a3f406d600226b62de570605b')
 
 build() {
   [ "${CARCH}" = "i686" ]   && KARCH=i386
@@ -82,18 +89,12 @@
   patch -Np1 -i ../atkbd.patch || return 1
   # add latest alsa fixes ftp://ftp.suse.com/pub/projects/alsa/snapshot/driver/
   # status is 20070506!
-  patch -Np1 -i ../alsa-20070506.patch || return 1
-  patch -Np0 -i ../alsa-include.patch || return 1
-  # fix patch_realtek for new asus and lenovo
-  patch -Np1 -i ../patch_realtek.patch || return 1
-  # fix sis900 oops
-  patch -Np1 -i ../sis900.patch || return 1
+  patch -Np0 -i ../alsa-20070524.patch || return 1
+  patch -Np0 -i ../alsa-include-20070524.patch || return 1
   # fix zd1211 driver to support more cards
   patch -Np1 -i ../zd1211.patch || return 1
   # fix buggy bios acpi to get c states
   patch -Np1 -i ../acpi-buggy-bios.patch || return 1
-  # revert sky2 change, it breaks some nics that actually work fine, sigh
-  patch -Rp1 -i ../revert_sky2.patch || return 1
   # fix alsa bluetooth, http://bluetooth-alsa.cvs.sourceforge.net/bluetooth-alsa/plugz/patches/
   patch -Np1 -i ../bluetooth-alsa.patch || return 1
   # add sqashfs
@@ -201,4 +202,3 @@
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26.install
   echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/${pkgname}.kver
 }
-
Index: arch/build/kernels/kernel26/alsa-2.6.21.patch.bz2
<<Binary file>>
Index: arch/build/kernels/kernel26/alsa-20070506.patch.bz2
<<Binary file>>
Index: arch/build/kernels/kernel26/config
diff -u arch/build/kernels/kernel26/config:1.97 arch/build/kernels/kernel26/config:1.98
--- arch/build/kernels/kernel26/config:1.97	Sun May  6 14:54:10 2007
+++ arch/build/kernels/kernel26/config	Fri May 25 13:39:32 2007
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
-# Fri Apr 27 19:23:23 2007
+# Linux kernel version: 2.6.21.2
+# Thu May 24 20:23:21 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -213,7 +213,7 @@
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_EFI=y
-CONFIG_IRQBALANCE=y
+# CONFIG_IRQBALANCE is not set
 CONFIG_BOOT_IOREMAP=y
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
@@ -3244,9 +3244,11 @@
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
 CONFIG_NCP_FS=m
@@ -3272,7 +3274,7 @@
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
+CONFIG_MAC_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_MINIX_SUBPARTITION is not set
Index: arch/build/kernels/kernel26/revert_sky2.patch
diff -u arch/build/kernels/kernel26/revert_sky2.patch:1.1 arch/build/kernels/kernel26/revert_sky2.patch:removed
--- arch/build/kernels/kernel26/revert_sky2.patch:1.1	Sun May  6 14:54:11 2007
+++ arch/build/kernels/kernel26/revert_sky2.patch	Fri May 25 13:39:32 2007
@@ -1,34 +0,0 @@
-From: Stephen Hemminger <shemminger at linux-foundation.org>
-Date: Wed, 11 Apr 2007 21:47:58 +0000 (-0700)
-Subject: sky2: disable support for 88E8056
-X-Git-Tag: v2.6.21~52
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0a17e4c252ce951615f3c1fccae6d6262c8d4187;hp=bf41a7c5d94a3d197002bdf11892529b47a63e99
-
-sky2: disable support for 88E8056
-
-This device is having all sorts of problems that lead to data corruption
-and system instability.  It gets receive status and data out of order,
-it generates descriptor and TSO errors, etc.
-
-Until the problems are resolved, it should not be used by anyone
-who cares about there system.
-
-Signed-off-by: Stephen Hemminger <shemminger at linux-foundation.org>
-Signed-off-by: Jeff Garzik <jeff at garzik.org>
----
-
-diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
-index 4a009b7..98b1f3a 100644
---- a/drivers/net/sky2.c
-+++ b/drivers/net/sky2.c
-@@ -123,7 +123,10 @@ static const struct pci_device_id sky2_id_table[] = {
- 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4361) }, /* 88E8050 */
- 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4362) }, /* 88E8053 */
- 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4363) }, /* 88E8055 */
-+#ifdef broken
-+	/* This device causes data corruption problems that are not resolved */
- 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4364) }, /* 88E8056 */
-+#endif
- 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4366) }, /* 88EC036 */
- 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4367) }, /* 88EC032 */
- 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4368) }, /* 88EC034 */
Index: arch/build/kernels/kernel26/sis900.patch
diff -u arch/build/kernels/kernel26/sis900.patch:1.1 arch/build/kernels/kernel26/sis900.patch:removed
--- arch/build/kernels/kernel26/sis900.patch:1.1	Thu May  3 15:38:03 2007
+++ arch/build/kernels/kernel26/sis900.patch	Fri May 25 13:39:32 2007
@@ -1,53 +0,0 @@
-From: Neil Horman <nhorman at tuxdriver.com>
-Date: Thu, 26 Apr 2007 17:47:36 +0000 (-0400)
-Subject: sis900: Allocate rx replacement buffer before rx operation
-X-Git-Url: http://git2.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=dc5a144991ba803bc8afded105c9db1dea0e57ab
-
-sis900: Allocate rx replacement buffer before rx operation
-
-Just found a hole in my last patch.  It was reported to me that shortly after we
-integrated this patch.  The report was of an oops that took place inside of
-netif_rx when using the sis900 driver.  Looking at my origional patch I noted
-that there was a spot between the new skb_alloc and the refill_rx_ring label
-where skb got reassigned to the pointer currently held in the rx_ring for the
-purposes of receiveing the frame.  The result of this is however that the buffer
-that gets passed to netif_rx (if it is called), then gets placed right back into
-the rx_ring.  So if you receive frames fast enough the skb being processed by
-the network stack can get corrupted.  The reporter is testing out the fix I've
-written for this below (I'm not near my hardware at the moment to test myself),
-but I wanted to post it for review ASAP.  I'll post test results when I hear
-them, but I think this is a pretty straightforward fix.  It just uses a separate
-pointer to do the rx operation, so that we don't improperly reassign the pointer
-that we use to refill the rx ring.
-
-Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
-Signed-off-by: Jeff Garzik <jeff at garzik.org>
----
-
-diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
-index dea0126..2cb2e15 100644
---- a/drivers/net/sis900.c
-+++ b/drivers/net/sis900.c
-@@ -1753,6 +1753,7 @@ static int sis900_rx(struct net_device *net_dev)
- 			sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE;
- 		} else {
- 			struct sk_buff * skb;
-+			struct sk_buff * rx_skb;
- 
- 			pci_unmap_single(sis_priv->pci_dev,
- 				sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE,
-@@ -1786,10 +1787,10 @@ static int sis900_rx(struct net_device *net_dev)
- 			}
- 
- 			/* give the socket buffer to upper layers */
--			skb = sis_priv->rx_skbuff[entry];
--			skb_put(skb, rx_size);
--			skb->protocol = eth_type_trans(skb, net_dev);
--			netif_rx(skb);
-+			rx_skb = sis_priv->rx_skbuff[entry];
-+			skb_put(rx_skb, rx_size);
-+			rx_skb->protocol = eth_type_trans(rx_skb, net_dev);
-+			netif_rx(rx_skb);
- 
- 			/* some network statistics */
- 			if ((rx_status & BCAST) == MCAST)

More information about the arch-commits mailing list