bump to 2.6.11.10

Package-Manager: portage-2.0.51.19

7 files changed, 60 insertions, 47 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 8862841eb8ac..b3b3f335ebdc 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.99 2005/05/19 07:26:58 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.100 2005/05/21 00:12:12 marineam Exp $
+
+*ck-sources-2.6.11_p8-r1 (20 May 2005)
+
+  20 May 2005; Michael Marineau <marineam@gentoo.org>
+  +files/ck-sources-2.6.11-92864.patch, -ck-sources-2.6.11_p7-r1.ebuild,
+  -ck-sources-2.6.11_p8.ebuild, +ck-sources-2.6.11_p8-r1.ebuild:
+  Add 2.6.11.10 patch, fixes bug #92864
 
   19 May 2005; Micheal Marineau <marineam@gentoo.org>
   ck-sources-2.6.11_p8.ebuild:
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 3224b493c61f..34271d361201 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1588b02d14ca45476bd1f079a123b9be ck-sources-2.6.11_p7-r1.ebuild 1043
-MD5 2c6ad4556dc9b49bbacf9627d5095e2f ck-sources-2.6.11_p8.ebuild 1471
-MD5 9562bf66a1ff3fb8804d8d74d44beac7 ChangeLog 22337
+MD5 3c69aa72ebc1550c7533dee3d16a6848 ChangeLog 22611
+MD5 d6625eff012b4a2a04610dced8093a30 ck-sources-2.6.11_p8-r1.ebuild 1507
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 0d9fc5edfa60d65566cee36814f96ca8 files/ck-sources-2.6.11-85795.patch 795
-MD5 fbb974b9faf15a80806c31312a051864 files/digest-ck-sources-2.6.11_p7-r1 131
+MD5 955b5c4f9067e7eb9da1a040ee2ad8bb files/digest-ck-sources-2.6.11_p8-r1 202
 MD5 7695b79187fcc27339ab62af1112ec11 files/ck-sources-2.6.11-74070.patch 525
 MD5 38e8ce7cb288b0b9ed6ceb58d4103547 files/ck-sources-2.6.11-lowmem-reserve-oops.patch 2788
 MD5 57c1c7b5c346447bc328430177de81e1 files/ck-sources-2.6.11-87913.patch 7942
-MD5 955b5c4f9067e7eb9da1a040ee2ad8bb files/digest-ck-sources-2.6.11_p8 202
+MD5 63b683248c8581cbf22f15217e71a571 files/ck-sources-2.6.11-92864.patch 1569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCjD/XnVkA0cTr1F4RAqqiAJ9NQXNANW6IVLEiIMhMqnH+YvP3jgCfaMfd
-eSx4WFWqaz49D4kG+Bi/qeY=
-=R5/f
+iD8DBQFCjnztnVkA0cTr1F4RAl0yAJ9F4CFEhSHl6ldYaxkuldxn3XJNdwCeOACI
+lP660ALYHHwAJIyNkeNhXoM=
+=iiKU
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.11_p7-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.11_p7-r1.ebuild
deleted file mode 100644
index c58f7a6aa9be..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.11_p7-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.11_p7-r1.ebuild,v 1.1 2005/05/11 07:52:10 marineam Exp $
-
-K_PREPATCHED="yes"
-UNIPATCH_STRICTORDER="yes"
-
-#K_NOSETEXTRAVERSION="no"
-K_NOUSENAME="yes"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-# A few hacks to set ck version via _p instead of -r
-MY_P=${P/_p*/}
-MY_PR=${PR/r/-r}
-EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
-KV_FULL=${OKV}${EXTRAVERSION}
-KV_CK=${KV_FULL/-r*/}
-
-CK_PATCH="patch-${KV_CK}.bz2"
-UNIPATCH_LIST="
-	${DISTDIR}/${CK_PATCH}
-	${FILESDIR}/${MY_P}-74070.patch
-	${FILESDIR}/${MY_P}-lowmem-reserve-oops.patch
-	${FILESDIR}/${MY_P}-87913.patch
-	${FILESDIR}/${MY_P}-85795.patch"
-IUSE=""
-
-DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance patchset"
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="${KERNEL_URI} http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/${CK_PATCH}"
-
-KEYWORDS="~x86 ~amd64"
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.11_p8.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.11_p8-r1.ebuild
index 422bd8f3981e..fcd72128d217 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.11_p8.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.11_p8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.11_p8.ebuild,v 1.2 2005/05/19 07:26:58 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.11_p8-r1.ebuild,v 1.1 2005/05/21 00:12:13 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
@@ -30,7 +30,8 @@ UNIPATCH_LIST="
 	${FILESDIR}/${MY_P}-74070.patch
 	${FILESDIR}/${MY_P}-lowmem-reserve-oops.patch
 	${FILESDIR}/${MY_P}-87913.patch
-	${FILESDIR}/${MY_P}-85795.patch"
+	${FILESDIR}/${MY_P}-85795.patch
+	${FILESDIR}/${MY_P}-92864.patch"
 
 DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance patchset"
 HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.11-92864.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.11-92864.patch
new file mode 100644
index 000000000000..5ce046f65a0e
--- /dev/null
+++ b/sys-kernel/ck-sources/files/ck-sources-2.6.11-92864.patch
@@ -0,0 +1,42 @@
+diff -Naur linux-2.6.11.9/drivers/block/ioctl.c linux-2.6.11.10/drivers/block/ioctl.c
+--- linux-2.6.11.9/drivers/block/ioctl.c	2005-05-11 15:41:10.000000000 -0700
++++ linux-2.6.11.10/drivers/block/ioctl.c	2005-05-16 10:50:31.000000000 -0700
+@@ -237,3 +237,5 @@
+ 	}
+ 	return ret;
+ }
++
++EXPORT_SYMBOL_GPL(blkdev_ioctl);
+diff -Naur linux-2.6.11.9/drivers/block/pktcdvd.c linux-2.6.11.10/drivers/block/pktcdvd.c
+--- linux-2.6.11.9/drivers/block/pktcdvd.c	2005-05-11 15:41:09.000000000 -0700
++++ linux-2.6.11.10/drivers/block/pktcdvd.c	2005-05-16 10:50:31.000000000 -0700
+@@ -2400,7 +2400,7 @@
+ 	case CDROM_LAST_WRITTEN:
+ 	case CDROM_SEND_PACKET:
+ 	case SCSI_IOCTL_SEND_COMMAND:
+-		return ioctl_by_bdev(pd->bdev, cmd, arg);
++		return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+ 
+ 	case CDROMEJECT:
+ 		/*
+@@ -2408,7 +2408,7 @@
+ 		 * have to unlock it or else the eject command fails.
+ 		 */
+ 		pkt_lock_door(pd, 0);
+-		return ioctl_by_bdev(pd->bdev, cmd, arg);
++		return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+ 
+ 	default:
+ 		printk("pktcdvd: Unknown ioctl for %s (%x)\n", pd->name, cmd);
+diff -Naur linux-2.6.11.9/drivers/char/raw.c linux-2.6.11.10/drivers/char/raw.c
+--- linux-2.6.11.9/drivers/char/raw.c	2005-05-11 15:42:19.000000000 -0700
++++ linux-2.6.11.10/drivers/char/raw.c	2005-05-16 10:50:31.000000000 -0700
+@@ -122,7 +122,7 @@
+ {
+ 	struct block_device *bdev = filp->private_data;
+ 
+-	return ioctl_by_bdev(bdev, command, arg);
++	return blkdev_ioctl(bdev->bd_inode, filp, command, arg);
+ }
+ 
+ static void bind_device(struct raw_config_request *rq)
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p7-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p7-r1
deleted file mode 100644
index c4b83df3eb8f..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p7-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 9ae38ce08a9856e11f6244d942ff85f7 patch-2.6.11-ck7.bz2 50832
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p8 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p8-r1
index a35ba294b709..a35ba294b709 100644
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p8
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p8-r1