ck10

(Portage version: 2.0.51.19)

12 files changed, 24 insertions, 429 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 10fdb39405c5..702df98dab1d 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,18 @@
 # 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.101 2005/06/09 20:28:13 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.102 2005/06/13 02:07:56 marineam Exp $
+
+*ck-sources-2.6.11_p10 (13 Jun 2005)
+
+  13 Jun 2005; Michael Marineau <marineam@gentoo.org>
+  -files/ck-sources-2.6.11-74070.patch,
+  -files/ck-sources-2.6.11-85795.patch,
+  -files/ck-sources-2.6.11-87913.patch,
+  -files/ck-sources-2.6.11-92864.patch,
+  -files/ck-sources-2.6.11-lowmem-reserve-oops.patch,
+  -ck-sources-2.6.11_p8-r1.ebuild, -ck-sources-2.6.11_p9.ebuild,
+  +ck-sources-2.6.11_p10.ebuild:
+  bump to 2.6.11.12, ck10, and genpatches 14.
 
 *ck-sources-2.6.11_p9 (09 Jun 2005)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index b96ddcfe51e1..85a22a503c00 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,21 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ce8d70a9c0e69f56be81b3480b5e7228 ck-sources-2.6.11_p9.ebuild 1998
+MD5 0623d4b22807c8895c25a7ab07e7c8f6 ck-sources-2.6.11_p10.ebuild 1969
 MD5 a971742d173ea6e57ca46161728bb1f5 ChangeLog 22821
-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 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 7489869f66c5366b2f8d42bdb592d845 files/digest-ck-sources-2.6.11_p9 279
-MD5 63b683248c8581cbf22f15217e71a571 files/ck-sources-2.6.11-92864.patch 1569
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCqKZ2nVkA0cTr1F4RAjc2AJ9+WigR9wTMIVI7nazIY1kt9FPy1wCdGa3n
-bYL9durPtsoaFJ8yCmXaXHk=
-=xfh1
------END PGP SIGNATURE-----
+MD5 cabf179e8073c4391a13f9c32148755a files/digest-ck-sources-2.6.11_p10 281
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.11_p9.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.11_p10.ebuild
index c4554edd06ec..f321f9e3d949 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.11_p9.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.11_p10.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_p9.ebuild,v 1.1 2005/06/09 20:28:13 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.11_p10.ebuild,v 1.1 2005/06/13 02:07:56 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
@@ -27,17 +27,16 @@ else
 fi
 
 #version of gentoo patchset
-GPV="11.13"
-GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
+GPV="11-14"
+GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2"
 
 UNIPATCH_LIST="
 	${DISTDIR}/${CK_PATCH}
-	${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
+	${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2"
 UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
-	1315_alpha-sysctl-uac.patch
 	10" #All of the 2.6.x.y patches (already in ck) start with 10
 
-UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/0000_README"
+UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}/0000_README"
 
 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/ck-sources-2.6.11_p8-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.11_p8-r1.ebuild
deleted file mode 100644
index fcd72128d217..000000000000
--- a/sys-kernel/ck-sources/ck-sources-2.6.11_p8-r1.ebuild
+++ /dev/null
@@ -1,50 +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_p8-r1.ebuild,v 1.1 2005/05/21 00:12:13 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}
-MY_PR=${MY_PR/-r0/}
-EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
-KV_FULL=${OKV}${EXTRAVERSION}
-KV_CK=${KV_FULL/-r*/}
-
-IUSE="ck-server"
-if use ck-server; then
-	CK_PATCH="patch-${KV_CK}-server.bz2"
-else
-	CK_PATCH="patch-${KV_CK}.bz2"
-fi
-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
-	${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/"
-SRC_URI="${KERNEL_URI} ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}-server.bz2 )
-	!ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
-
-KEYWORDS="~x86 ~amd64"
-
-pkg_postinst() {
-	postinst_sources
-
-	einfo "The ck patchset is tuned for desktop usage."
-	einfo "To better tune the kernel for server applications add"
-	einfo "ck-server to your use flags and reemerge ck-sources"
-}
-
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.11-74070.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.11-74070.patch
deleted file mode 100644
index 3b4ee332f9e9..000000000000
--- a/sys-kernel/ck-sources/files/ck-sources-2.6.11-74070.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.6.10/net/sunrpc/svc.c.orig	2005-01-18 03:18:08.235362992 +0000
-+++ linux-2.6.10/net/sunrpc/svc.c	2005-01-18 03:18:28.532277392 +0000
-@@ -446,7 +446,7 @@ err_bad_auth:
- err_bad_prog:
- #ifdef RPC_PARANOIA
- 	if (prog != 100227 || progp->pg_prog != 100003)
--		printk("svc: unknown program %d (me %d)\n", prog, progp->pg_prog);
-+		printk("svc: unknown program %d (me %d)\n", prog, serv->sv_program->pg_prog);
- 	/* else it is just a Solaris client seeing if ACLs are supported */
- #endif
- 	serv->sv_stats->rpcbadfmt++;
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.11-85795.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.11-85795.patch
deleted file mode 100644
index ea4e198f433b..000000000000
--- a/sys-kernel/ck-sources/files/ck-sources-2.6.11-85795.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
-ROSE wasn't verifying the ndigis argument of a new route resulting in a
-minor security hole.
-
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
- net/rose/rose_route.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletion(-)
-
-diff -puN net/rose/rose_route.c~rose-fix-ndigis net/rose/rose_route.c
---- linux-2.6.11/net/rose/rose_route.c~rose-fix-ndigis	2005-05-01 21:38:21.420553912 +0200
-+++ linux-2.6.11-lorenzo/net/rose/rose_route.c	2005-05-01 21:38:21.424553304 +0200
-@@ -727,7 +727,8 @@ int rose_rt_ioctl(unsigned int cmd, void
- 		}
- 		if (rose_route.mask > 10) /* Mask can't be more than 10 digits */
- 			return -EINVAL;
--
-+		if (rose_route.ndigis > 8) /* No more than 8 digipeats */
-+			return -EINVAL;
- 		err = rose_add_node(&rose_route, dev);
- 		dev_put(dev);
- 		return err;
-_
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.11-87913.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.11-87913.patch
deleted file mode 100644
index 5cf4f2ede2e0..000000000000
--- a/sys-kernel/ck-sources/files/ck-sources-2.6.11-87913.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-# origin: daniel (BitKeeper)
-# cset: 1.2181.39.4 (2.6) key=4248c8c0es30_4YVdwa6vteKi7h_nw
-# URL: http://linux.bkbits.net:8080/linux-2.6/cset@4248c8c0es30_4YVdwa6vteKi7h_nw
-# inclusion: upstream
-# descrition: [PATCH] ppc64: fix AIO panic on PPC64 caused by is_hugepage_only_range()
-# revision date: Fri, 01 Apr 2005 17:59:58 +0900
-#
-# S rset: ChangeSet|1.2181.39.3..1.2181.39.4
-# I rset: include/asm-ppc64/page.h|1.42..1.43
-# I rset: include/asm-ia64/page.h|1.33..1.34
-# I rset: include/linux/hugetlb.h|1.33..1.34
-# I rset: arch/ppc64/mm/hugetlbpage.c|1.41..1.42
-# I rset: mm/mmap.c|1.168..1.169
-#
-# Key:
-# S: Skipped  ChangeSet file only
-# O: Original Followed by Updated
-# U: Updated  Included with updated range of versions
-# I: Included Included verbatim
-# E: Excluded Excluded on request from user
-# D: Deleted  Manually deleted by subsequent user edit
-# R: Revised  Manually revised by subsequent user edit
-#
-#
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2005/03/28 19:17:20-08:00 daniel@osdl.org 
-#   [PATCH] ppc64: fix AIO panic on PPC64 caused by is_hugepage_only_range()
-#   
-#   When testing AIO on PPC64 (a power5 machine) running 2.6.11 with
-#   CONFIG_HUGETLB_PAGE=y, I ran into a kernel panic when a process exits that has
-#   done AIO (io_queue_init()) but has not done the io_queue_release().  The
-#   exit_aio() code is cleaning up and panicking when trying to free the aio ring
-#   buffer.
-#   
-#   I tracked this down to is_hugepage_only_range() (include/asm-ppc64/page.h)
-#   which is doing a touches_hugepage_low_range() which is checking
-#   current->mm->context.htlb_segs.  The problem is that exit_mm() cleared tsk->mm
-#   before doing the mmput() which leads to the exit_aio() and then the panic. 
-#   Looks like is_hugepage_only_range() is only used in ia64 and ppc64.  Fix is to
-#   change is_hugepage_only_range() to take an 'mm' as a parameter as well as
-#   'addr' and 'len' and then the ppc64 code could change to use 'mm'.  It looks
-#   like it has been broken for quite a while.
-#   
-#   Signed-off-by: Daniel McNeil <daniel@osdl.org>
-#   Acked-by: David Gibson <dwg@au1.ibm.com>
-#   Acked-by: "Luck, Tony" <tony.luck@intel.com>
-#   Signed-off-by: Andrew Morton <akpm@osdl.org>
-#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-# 
-# mm/mmap.c
-#   2005/03/28 14:43:15-08:00 daniel@osdl.org +2 -2
-#   ppc64: fix AIO panic on PPC64 caused by is_hugepage_only_range()
-# 
-# include/linux/hugetlb.h
-#   2005/03/28 14:21:16-08:00 daniel@osdl.org +2 -2
-#   ppc64: fix AIO panic on PPC64 caused by is_hugepage_only_range()
-# 
-# include/asm-ppc64/page.h
-#   2005/03/28 14:21:16-08:00 daniel@osdl.org +4 -4
-#   ppc64: fix AIO panic on PPC64 caused by is_hugepage_only_range()
-# 
-# include/asm-ia64/page.h
-#   2005/03/28 14:21:16-08:00 daniel@osdl.org +1 -1
-#   ppc64: fix AIO panic on PPC64 caused by is_hugepage_only_range()
-# 
-# arch/ppc64/mm/hugetlbpage.c
-#   2005/03/28 14:43:14-08:00 daniel@osdl.org +4 -4
-#   ppc64: fix AIO panic on PPC64 caused by is_hugepage_only_range()
-# 
-#
-===== include/asm-ppc64/page.h 1.42 vs 1.43 =====
---- 1.42/include/asm-ppc64/page.h	2005-03-17 17:31:09 +09:00
-+++ 1.43/include/asm-ppc64/page.h	2005-03-29 07:21:16 +09:00
-@@ -48,8 +48,8 @@
- #define ARCH_HAS_HUGEPAGE_ONLY_RANGE
- #define ARCH_HAS_PREPARE_HUGEPAGE_RANGE
- 
--#define touches_hugepage_low_range(addr, len) \
--	(LOW_ESID_MASK((addr), (len)) & current->mm->context.htlb_segs)
-+#define touches_hugepage_low_range(mm, addr, len) \
-+	(LOW_ESID_MASK((addr), (len)) & mm->context.htlb_segs)
- #define touches_hugepage_high_range(addr, len) \
- 	(((addr) > (TASK_HPAGE_BASE-(len))) && ((addr) < TASK_HPAGE_END))
- 
-@@ -61,9 +61,9 @@
- #define within_hugepage_high_range(addr, len) (((addr) >= TASK_HPAGE_BASE) \
- 	  && ((addr)+(len) <= TASK_HPAGE_END) && ((addr)+(len) >= (addr)))
- 
--#define is_hugepage_only_range(addr, len) \
-+#define is_hugepage_only_range(mm, addr, len) \
- 	(touches_hugepage_high_range((addr), (len)) || \
--	  touches_hugepage_low_range((addr), (len)))
-+	  touches_hugepage_low_range((mm), (addr), (len)))
- #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
- 
- #define in_hugepage_area(context, addr) \
-===== include/asm-ia64/page.h 1.33 vs 1.34 =====
---- 1.33/include/asm-ia64/page.h	2005-02-09 18:53:37 +09:00
-+++ 1.34/include/asm-ia64/page.h	2005-03-29 07:21:16 +09:00
-@@ -137,7 +137,7 @@ typedef union ia64_va {
- # define htlbpage_to_page(x)	(((unsigned long) REGION_NUMBER(x) << 61)			\
- 				 | (REGION_OFFSET(x) >> (HPAGE_SHIFT-PAGE_SHIFT)))
- # define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)
--# define is_hugepage_only_range(addr, len)		\
-+# define is_hugepage_only_range(mm, addr, len)		\
- 	 (REGION_NUMBER(addr) == REGION_HPAGE &&	\
- 	  REGION_NUMBER((addr)+(len)) == REGION_HPAGE)
- extern unsigned int hpage_shift;
-===== include/linux/hugetlb.h 1.33 vs 1.34 =====
---- 1.33/include/linux/hugetlb.h	2004-08-08 15:43:40 +09:00
-+++ 1.34/include/linux/hugetlb.h	2005-03-29 07:21:16 +09:00
-@@ -36,7 +36,7 @@ extern const unsigned long hugetlb_zero,
- extern int sysctl_hugetlb_shm_group;
- 
- #ifndef ARCH_HAS_HUGEPAGE_ONLY_RANGE
--#define is_hugepage_only_range(addr, len)	0
-+#define is_hugepage_only_range(mm, addr, len)	0
- #define hugetlb_free_pgtables(tlb, prev, start, end) do { } while (0)
- #endif
- 
-@@ -71,7 +71,7 @@ static inline unsigned long hugetlb_tota
- #define is_aligned_hugepage_range(addr, len)	0
- #define prepare_hugepage_range(addr, len)	(-EINVAL)
- #define pmd_huge(x)	0
--#define is_hugepage_only_range(addr, len)	0
-+#define is_hugepage_only_range(mm, addr, len)	0
- #define hugetlb_free_pgtables(tlb, prev, start, end) do { } while (0)
- #define alloc_huge_page()			({ NULL; })
- #define free_huge_page(p)			({ (void)(p); BUG(); })
-===== arch/ppc64/mm/hugetlbpage.c 1.41 vs 1.42 =====
---- 1.41/arch/ppc64/mm/hugetlbpage.c	2005-03-15 15:27:33 +09:00
-+++ 1.42/arch/ppc64/mm/hugetlbpage.c	2005-03-29 07:43:14 +09:00
-@@ -513,7 +513,7 @@ unsigned long arch_get_unmapped_area(str
- 		vma = find_vma(mm, addr);
- 		if (((TASK_SIZE - len) >= addr)
- 		    && (!vma || (addr+len) <= vma->vm_start)
--		    && !is_hugepage_only_range(addr,len))
-+		    && !is_hugepage_only_range(mm, addr,len))
- 			return addr;
- 	}
- 	start_addr = addr = mm->free_area_cache;
-@@ -523,7 +523,7 @@ full_search:
- 	while (TASK_SIZE - len >= addr) {
- 		BUG_ON(vma && (addr >= vma->vm_end));
- 
--		if (touches_hugepage_low_range(addr, len)) {
-+		if (touches_hugepage_low_range(mm, addr, len)) {
- 			addr = ALIGN(addr+1, 1<<SID_SHIFT);
- 			vma = find_vma(mm, addr);
- 			continue;
-@@ -584,7 +584,7 @@ arch_get_unmapped_area_topdown(struct fi
- 		vma = find_vma(mm, addr);
- 		if (TASK_SIZE - len >= addr &&
- 				(!vma || addr + len <= vma->vm_start)
--				&& !is_hugepage_only_range(addr,len))
-+				&& !is_hugepage_only_range(mm, addr,len))
- 			return addr;
- 	}
- 
-@@ -597,7 +597,7 @@ try_again:
- 	addr = (mm->free_area_cache - len) & PAGE_MASK;
- 	do {
- hugepage_recheck:
--		if (touches_hugepage_low_range(addr, len)) {
-+		if (touches_hugepage_low_range(mm, addr, len)) {
- 			addr = (addr & ((~0) << SID_SHIFT)) - len;
- 			goto hugepage_recheck;
- 		} else if (touches_hugepage_high_range(addr, len)) {
-===== mm/mmap.c 1.168 vs 1.169 =====
---- 1.168/mm/mmap.c	2005-03-10 17:38:22 +09:00
-+++ 1.169/mm/mmap.c	2005-03-29 07:43:15 +09:00
-@@ -1316,7 +1316,7 @@ get_unmapped_area(struct file *file, uns
- 			 * reserved hugepage range.  For some archs like IA-64,
- 			 * there is a separate region for hugepages.
- 			 */
--			ret = is_hugepage_only_range(addr, len);
-+			ret = is_hugepage_only_range(current->mm, addr, len);
- 		}
- 		if (ret)
- 			return -EINVAL;
-@@ -1687,7 +1687,7 @@ static void unmap_region(struct mm_struc
- 	unmap_vmas(&tlb, mm, vma, start, end, &nr_accounted, NULL);
- 	vm_unacct_memory(nr_accounted);
- 
--	if (is_hugepage_only_range(start, end - start))
-+	if (is_hugepage_only_range(mm, start, end - start))
- 		hugetlb_free_pgtables(tlb, prev, start, end);
- 	else
- 		free_pgtables(tlb, prev, start, end);
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
deleted file mode 100644
index 5ce046f65a0e..000000000000
--- a/sys-kernel/ck-sources/files/ck-sources-2.6.11-92864.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/ck-sources-2.6.11-lowmem-reserve-oops.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.11-lowmem-reserve-oops.patch
deleted file mode 100644
index 42fbfe236b91..000000000000
--- a/sys-kernel/ck-sources/files/ck-sources-2.6.11-lowmem-reserve-oops.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-If you do 'echo 0 0 > /proc/sys/vm/lowmem_reserve_ratio' the kernel gets a
-divide-by-zero.
-
-Prevent that, and fiddle with some whitespace too.
-
-Signed-off-by: Andrew Morton <akpm@osdl.org>
----
-
- 25-akpm/mm/page_alloc.c |   21 +++++++++++++++------
- 1 files changed, 15 insertions(+), 6 deletions(-)
-
-diff -puN mm/page_alloc.c~setup_per_zone_lowmem_reserve-oops-fix mm/page_alloc.c
---- 25/mm/page_alloc.c~setup_per_zone_lowmem_reserve-oops-fix	2005-03-01 00:13:57.000000000 -0800
-+++ 25-akpm/mm/page_alloc.c	2005-03-01 00:13:57.000000000 -0800
-@@ -37,13 +37,17 @@
- #include <asm/tlbflush.h>
- #include "internal.h"
- 
--/* MCD - HACK: Find somewhere to initialize this EARLY, or make this initializer cleaner */
-+/*
-+ * MCD - HACK: Find somewhere to initialize this EARLY, or make this
-+ * initializer cleaner
-+ */
- nodemask_t node_online_map = { { [0] = 1UL } };
- nodemask_t node_possible_map = NODE_MASK_ALL;
- struct pglist_data *pgdat_list;
- unsigned long totalram_pages;
- unsigned long totalhigh_pages;
- long nr_swap_pages;
-+
- /*
-  * results with 256, 32 in the lowmem_reserve sysctl:
-  *	1G machine -> (16M dma, 800M-16M normal, 1G-800M high)
-@@ -1924,15 +1928,20 @@ static void setup_per_zone_lowmem_reserv
- 
- 	for_each_pgdat(pgdat) {
- 		for (j = 0; j < MAX_NR_ZONES; j++) {
--			struct zone * zone = pgdat->node_zones + j;
-+			struct zone *zone = pgdat->node_zones + j;
- 			unsigned long present_pages = zone->present_pages;
- 
- 			zone->lowmem_reserve[j] = 0;
- 
- 			for (idx = j-1; idx >= 0; idx--) {
--				struct zone * lower_zone = pgdat->node_zones + idx;
-+				struct zone *lower_zone;
-+
-+				if (sysctl_lowmem_reserve_ratio[idx] < 1)
-+					sysctl_lowmem_reserve_ratio[idx] = 1;
- 
--				lower_zone->lowmem_reserve[j] = present_pages / sysctl_lowmem_reserve_ratio[idx];
-+				lower_zone = pgdat->node_zones + idx;
-+				lower_zone->lowmem_reserve[j] = present_pages /
-+					sysctl_lowmem_reserve_ratio[idx];
- 				present_pages += lower_zone->present_pages;
- 			}
- 		}
-@@ -2039,7 +2048,7 @@ module_init(init_per_zone_pages_min)
-  *	changes.
-  */
- int min_free_kbytes_sysctl_handler(ctl_table *table, int write, 
--		struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
-+	struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
- {
- 	proc_dointvec(table, write, file, buffer, length, ppos);
- 	setup_per_zone_pages_min();
-@@ -2056,7 +2065,7 @@ int min_free_kbytes_sysctl_handler(ctl_t
-  * if in function of the boot time zone sizes.
-  */
- int lowmem_reserve_ratio_sysctl_handler(ctl_table *table, int write,
--		 struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
-+	struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
- {
- 	proc_dointvec_minmax(table, write, file, buffer, length, ppos);
- 	setup_per_zone_lowmem_reserve();
-_
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p10 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p10
new file mode 100644
index 000000000000..26d7ff5bfb0c
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p10
@@ -0,0 +1,4 @@
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 1de4e2172e543605efdf523887d29d70 genpatches-2.6.11-14.base.tar.bz2 48592
+MD5 61ec23a266fc2e8da72c282578126f62 patch-2.6.11-ck10-server.bz2 60239
+MD5 ecb293a983973548e826d1390b485f97 patch-2.6.11-ck10.bz2 60551
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p8-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p8-r1
deleted file mode 100644
index a35ba294b709..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 73ab96f0e86b3b8897d46c06395e04ad patch-2.6.11-ck8-server.bz2 51909
-MD5 eef4006a8096ec7d7f526dae9de5faaf patch-2.6.11-ck8.bz2 52120
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p9 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p9
deleted file mode 100644
index 41476c51e08b..000000000000
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11_p9
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 54eb52ff4c8ba5f111e6e91b7b4925cd genpatches-2.6-11.13-base.tar.bz2 46990
-MD5 48a9a415c487127cc3a206bc380638eb patch-2.6.11-ck9-server.bz2 57786
-MD5 8f79fd05a70891127fa28ae6e5edb53f patch-2.6.11-ck9.bz2 58064