r2127 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series
Andres Salomon
dilinger-guest@costa.debian.org
Wed, 05 Jan 2005 05:48:32 +0100
Author: dilinger-guest
Date: 2005-01-05 05:48:30 +0100 (Wed, 05 Jan 2005)
New Revision: 2127
Added:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/001-acpi_ibm_exit.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/002-pio_err_handling.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/003-libata_alpha_build_fix.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/004-sparc64_no_i_sock.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/005-sparc64_no_i_sock-2.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/006-zatm_cast_fix_fix.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/008-sock_without_ipv6.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/009-ipt_ecn_corrupt_chksum.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/010-sparc64_macro_pmd_offset.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/011-parport_pc_module_parm_mixing.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/012-conntrack_standalone_proc_removal.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/013-conntrack_standalone_sysctl.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/014-acpi_video_dev_slab_corruption.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/015-vmscan_total_scanned.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/016-cs461x_gameport.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/017-conntrack_sctp_sysctl.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/018-ipt_recent_proc_remove.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/019-conntrack_tcp_RST_handling.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/020-clear_cyrix_mii_ecx_reg.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/021-sunrpc_check_before_kill.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/022-sunrpc_xdr_flush_pages.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/023-nfs_dentry_refcount.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/024-nfs_incorrect_df_output.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/025-track_dummy_capability.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/026-nfs_o_direct_error.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/027-track_dummy_capability-2.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1
Log:
Add 27 patches backported from BK. All small, localized fixes.
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-05 04:48:30 UTC (rev 2127)
@@ -80,8 +80,114 @@
* Added Al Viro's patch which fixes mxser.c compile on alpha and powerpc
(Norbert Tretkowski).
- -- Joshua Kwan <joshk@triplehelix.org> Thu, 30 Dec 2004 12:53:40 -0800
+ * 001-acpi_ibm_exit.dpatch
+ Make acpi_ibm_exit() not marked as __exit; it is called by __init
+ functions (Andres Salomon).
+ * 002-pio_err_handling.dpatch
+ Properly handle PIO errors (Andres Salomon).
+
+ * 003-libata_alpha_build_fix.dpatch
+ [ALPHA] Rumor has it, linux/mm.h should be included. It certainly
+ can't hurt (Andres Salomon).
+
+ * 004-sparc64_no_i_sock.dpatch
+ [SPARC64] Don't reference ino->i_sock directly; instead, use the
+ S_ISSOCK() macro (Andres Salomon).
+
+ * 005-sparc64_no_i_sock-2.dpatch
+ [SPARC64] s/IS_SOCK/S_ISSOCK/, from 004-sparc64_no_i_sock.dpatch
+ (Andres Salomon).
+
+ * 006-zatm_cast_fix_fix.dpatch
+ Fix a silly gcc4 "fix"; in an attempt to drop an lvalue cast,
+ the wrong variable was assigned to (leaking memory, clobbering
+ the variable, etc) (Andres Salomon).
+
+ * 007-pci_ide_no_reserve.dpatch
+ Make generic_init_one return proper error values, instead of
+ true/false. This was causing pci devices to be reserved when
+ they shouldn't have been (Andres Salomon).
+
+ * 008-sock_without_ipv6.dpatch
+ Fix net/core/sock.o build failure (Andres Salomon).
+
+ * 009-ipt_ecn_corrupt_chksum.dpatch
+ ipt_ECN checksum corruption (potentially) happens without this
+ patch (Andres Salomon).
+
+ * 010-sparc64_macro_pmd_offset.dpatch
+ [SPARC64] Safely use parens in a macro arg; this caused a warning
+ (Andres Salomon).
+
+ * 011-parport_pc_module_parm_mixing.dpatch
+ Don't mix module_param() and MODULE_PARM(), or you'll go blind
+ (Andres Salomon).
+
+ * 012-conntrack_standalone_proc_removal.dpatch
+ Properly remove /proc entry in ip_conntrack_standalone (Andres Salomon).
+
+ * 013-conntrack_standalone_sysctl.dpatch
+ Properly clean up if sysctl registration fails in
+ ip_conntrack_standalone (Andres Salomon).
+
+ * 014-acpi_video_dev_slab_corruption.dpatch
+ Fix slab cache corruption caused by acpi video stuff. Fun, fun!
+ (Andres Salomon)
+
+ * 015-vmscan_total_scanned.dpatch
+ Keep total_scanned up to date in try_to_free_pages; not doing so
+ was breaking some kswapd stuff (Andres Salomon).
+
+ * 016-cs461x_gameport.dpatch
+ Fix Makefile to actually build cs461x.o (Andres Salomon).
+
+ * 017-conntrack_sctp_sysctl.dpatch
+ Make sure we don't return 0 (ie, "everything's ok") if sysctl
+ registration fails in ip_conntrack_proto_sctp (Andres Salomon).
+
+ * 018-ipt_recent_proc_remove.dpatch
+ ipt_recent's init stuff wasn't properly cleaning up /proc entries
+ upon failure (Andres Salomon).
+
+ * 019-conntrack_tcp_RST_handling.dpatch
+ ip_conntrack doesn't handle RST packets correctly (Andres Salomon).
+
+ * 020-clear_cyrix_mii_ecx_reg.dpatch
+ Cyrix MIIs don't clear %ecx when calling cpuid(); so we had stale
+ data in there (Andres Salomon).
+
+ * 021-sunrpc_check_before_kill.dpatch
+ Let's not add uninitialized tasks to the rpc task list, as that's
+ just asking for trouble (Andres Salomon).
+
+ * 022-sunrpc_xdr_flush_pages.dpatch
+ Flush pages when shifting them (Andres Salomon).
+
+ * 023-nfs_dentry_refcount.dpatch
+ Fix dentry refcount accounting error (Andres Salomon).
+
+ * 024-nfs_incorrect_df_output.dpatch
+ NFS mounts were apparently causing 'df' to display incorrect
+ information (Andres Salomon).
+
+ * 025-track_dummy_capability.dpatch
+ [SECURITY] The dummy capabilities module wasn't keeping track of
+ processes capabilities; so, when a capabilities module was loaded,
+ all untracked processes would magically be given full capabilities.
+ Here's the skinny:
+ http://www.derkeiler.com/Mailing-Lists/securityfocus/bugtraq/2004-12/0390.html
+ (Andres Salomon).
+
+ * 026-nfs_o_direct_error.dpatch
+ In case of failure, nfs_get_user_pages should set pages to NULL
+ (Andres Salomon).
+
+ * 027-track_dummy_capability-2.dpatch
+ Fix patch 025-track_dummy_capability.dpatch (Andres Salomon).
+
+ -- Andres Salomon <dilinger@voxel.net> Tue, 04 Jan 2005 23:52:23 -0500
+
kernel-source-2.6.9 (2.6.9-4) unstable; urgency=low
* Add bw2/cyber2000fb fixes from BK to fix compilation problems.
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/001-acpi_ibm_exit.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/001-acpi_ibm_exit.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/001-acpi_ibm_exit.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] drivers/acpi/ibm_acpi.o .init.text refers to .exit.text
+## DP: Patch author: arjan@infradead.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/27 10:24:28-08:00 arjan@infradead.org
+# [PATCH] drivers/acpi/ibm_acpi.o .init.text refers to .exit.text
+#
+# the ibm_acpi.c driver references acpi_ibm_exit() from it's __init function,
+# which means the exit function isn't allowed to be __exit since __exit
+# functions are not part of vmlinux while __init functions are.
+#
+# Signed-off-by: Arjan van de Ven <arjan@infradead.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/acpi/ibm_acpi.c
+# 2004/12/27 02:20:31-08:00 arjan@infradead.org +1 -1
+# drivers/acpi/ibm_acpi.o .init.text refers to .exit.text
+#
+diff -Nru a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
+--- a/drivers/acpi/ibm_acpi.c 2005-01-04 17:37:08 -08:00
++++ b/drivers/acpi/ibm_acpi.c 2005-01-04 17:37:08 -08:00
+@@ -1168,7 +1168,7 @@
+ #define IBM_PARAM(feature) \
+ module_param_call(feature, set_ibm_param, NULL, NULL, 0)
+
+-static void __exit acpi_ibm_exit(void)
++static void acpi_ibm_exit(void)
+ {
+ int i;
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/002-pio_err_handling.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/002-pio_err_handling.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/002-pio_err_handling.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,105 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [libata] PIO error handling improvement
+## DP: Patch author: albertcc@tw.ibm.com
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/27 15:24:53-05:00 albertcc@tw.ibm.com
+# [libata] PIO error handling improvement
+#
+# Tested burning CD-RW with libata-dev-2.6 and cdrecord:
+# 1. ATAPI DMA mode - tested OK
+# 2. ATAPI PIO mode - test failed when cdrecord finishes burning and issues MODE_SELECT to the device.
+#
+# After checking the log, it showed that MODE_SELECT caused ata_pio_complete() to return error.
+# However, the error is not handled by ata_pio_task().
+#
+# Attached please find the patch for ata_pio_task() error handling for your review.
+# (The patch is against the libata-dev-2.6 tree. )
+#
+# Changes in the patch:
+# 1. End the PIO task when PIO_ST_IDLE state is entered
+# 2. End the PIO task after PIO_ST_TMOUT and PIO_ST_ERR state handled by ata_pio_error()
+# 3. Remove the first "if" statement to handle the error condition returned from
+# ata_pio_block(), ata_pio_complete() and ata_pio_poll().
+#
+# Change #2 is not so necessary since ata_pio_error() will put the cmd to PIO_ST_IDLE state
+# after the error condition is handled. The change just saves a function call to queue_work().
+#
+# Tested OK on on my machine with pdc20275 and ASUS CD-RW drive.
+#
+# Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
+#
+# drivers/scsi/libata-core.c
+# 2004/12/27 15:24:47-05:00 albertcc@tw.ibm.com +9 -10
+# [libata] PIO error handling improvement
+#
+# Tested burning CD-RW with libata-dev-2.6 and cdrecord:
+# 1. ATAPI DMA mode - tested OK
+# 2. ATAPI PIO mode - test failed when cdrecord finishes burning and issues MODE_SELECT to the device.
+#
+# After checking the log, it showed that MODE_SELECT caused ata_pio_complete() to return error.
+# However, the error is not handled by ata_pio_task().
+#
+# Attached please find the patch for ata_pio_task() error handling for your review.
+# (The patch is against the libata-dev-2.6 tree. )
+#
+# Changes in the patch:
+# 1. End the PIO task when PIO_ST_IDLE state is entered
+# 2. End the PIO task after PIO_ST_TMOUT and PIO_ST_ERR state handled by ata_pio_error()
+# 3. Remove the first "if" statement to handle the error condition returned from
+# ata_pio_block(), ata_pio_complete() and ata_pio_poll().
+#
+# Change #2 is not so necessary since ata_pio_error() will put the cmd to PIO_ST_IDLE state
+# after the error condition is handled. The change just saves a function call to queue_work().
+#
+# Tested OK on on my machine with pdc20275 and ASUS CD-RW drive.
+#
+# Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
+#
+diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
+--- a/drivers/scsi/libata-core.c 2005-01-04 17:44:20 -08:00
++++ b/drivers/scsi/libata-core.c 2005-01-04 17:44:20 -08:00
+@@ -2369,6 +2369,9 @@
+ unsigned long timeout = 0;
+
+ switch (ap->pio_task_state) {
++ case PIO_ST_IDLE:
++ return;
++
+ case PIO_ST:
+ ata_pio_block(ap);
+ break;
+@@ -2385,18 +2388,14 @@
+ case PIO_ST_TMOUT:
+ case PIO_ST_ERR:
+ ata_pio_error(ap);
+- break;
++ return;
+ }
+
+- if ((ap->pio_task_state != PIO_ST_IDLE) &&
+- (ap->pio_task_state != PIO_ST_TMOUT) &&
+- (ap->pio_task_state != PIO_ST_ERR)) {
+- if (timeout)
+- queue_delayed_work(ata_wq, &ap->pio_task,
+- timeout);
+- else
+- queue_work(ata_wq, &ap->pio_task);
+- }
++ if (timeout)
++ queue_delayed_work(ata_wq, &ap->pio_task,
++ timeout);
++ else
++ queue_work(ata_wq, &ap->pio_task);
+ }
+
+ static void atapi_request_sense(struct ata_port *ap, struct ata_device *dev,
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/003-libata_alpha_build_fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/003-libata_alpha_build_fix.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/003-libata_alpha_build_fix.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [libata] add #include (fixes 2.4 alpha build)
+## DP: Patch author: stkn@gentoo.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/27 15:41:28-05:00 stkn@gentoo.org
+# [libata] add #include (fixes 2.4 alpha build)
+#
+# drivers/scsi/libata-core.c
+# 2004/12/27 15:41:22-05:00 stkn@gentoo.org +1 -0
+# [libata] add #include (fixes 2.4 alpha build)
+#
+diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
+--- a/drivers/scsi/libata-core.c 2005-01-04 17:45:44 -08:00
++++ b/drivers/scsi/libata-core.c 2005-01-04 17:45:44 -08:00
+@@ -28,6 +28,7 @@
+ #include <linux/pci.h>
+ #include <linux/init.h>
+ #include <linux/list.h>
++#include <linux/mm.h>
+ #include <linux/highmem.h>
+ #include <linux/spinlock.h>
+ #include <linux/blkdev.h>
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/004-sparc64_no_i_sock.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/004-sparc64_no_i_sock.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/004-sparc64_no_i_sock.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,105 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [SPARC64]: Stop referencing i_sock directly.
+## DP: Patch author: matthew@wil.cx
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/27 20:55:17-08:00 matthew@wil.cx
+# [SPARC64]: Stop referencing i_sock directly.
+#
+# Use S_ISSOCK() instead.
+#
+# Signed-off-by: Matthew Wilcox <matthew@wil.cx>
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# arch/sparc64/solaris/ioctl.c
+# 2004/12/27 20:54:56-08:00 matthew@wil.cx +2 -2
+# [SPARC64]: Stop referencing i_sock directly.
+#
+# Use S_ISSOCK() instead.
+#
+# Signed-off-by: Matthew Wilcox <matthew@wil.cx>
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# arch/sparc64/solaris/socksys.c
+# 2004/12/27 20:54:56-08:00 matthew@wil.cx +1 -1
+# [SPARC64]: Stop referencing i_sock directly.
+#
+# Use S_ISSOCK() instead.
+#
+# Signed-off-by: Matthew Wilcox <matthew@wil.cx>
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# arch/sparc64/solaris/timod.c
+# 2004/12/27 20:54:56-08:00 matthew@wil.cx +2 -4
+# [SPARC64]: Stop referencing i_sock directly.
+#
+# Use S_ISSOCK() instead.
+#
+# Signed-off-by: Matthew Wilcox <matthew@wil.cx>
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+diff -Nru a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c
+--- a/arch/sparc64/solaris/ioctl.c 2005-01-04 17:50:57 -08:00
++++ b/arch/sparc64/solaris/ioctl.c 2005-01-04 17:50:57 -08:00
+@@ -298,7 +298,7 @@
+ if (! current->files->fd[fd] ||
+ ! current->files->fd[fd]->f_dentry ||
+ ! (ino = current->files->fd[fd]->f_dentry->d_inode) ||
+- ! ino->i_sock) {
++ ! S_ISSOCK(ino->i_mode)) {
+ spin_unlock(¤t->files->file_lock);
+ return TBADF;
+ }
+@@ -478,7 +478,7 @@
+ struct module_info *mi;
+
+ ino = filp->f_dentry->d_inode;
+- if (! ino->i_sock)
++ if (!S_ISSOCK(ino->i_mode))
+ return -EBADF;
+ sock = filp->private_data;
+ if (! sock) {
+diff -Nru a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
+--- a/arch/sparc64/solaris/socksys.c 2005-01-04 17:50:57 -08:00
++++ b/arch/sparc64/solaris/socksys.c 2005-01-04 17:50:57 -08:00
+@@ -150,7 +150,7 @@
+ unsigned int mask = 0;
+
+ ino=filp->f_dentry->d_inode;
+- if (ino && ino->i_sock) {
++ if (ino && S_ISSOCK(ino->i_mode)) {
+ struct sol_socket_struct *sock;
+ sock = (struct sol_socket_struct*)filp->private_data;
+ if (sock && sock->pfirst) {
+diff -Nru a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
+--- a/arch/sparc64/solaris/timod.c 2005-01-04 17:50:57 -08:00
++++ b/arch/sparc64/solaris/timod.c 2005-01-04 17:50:57 -08:00
+@@ -853,9 +853,7 @@
+ if(!filp) goto out;
+
+ ino = filp->f_dentry->d_inode;
+- if (!ino) goto out;
+-
+- if (!ino->i_sock)
++ if (!ino || !S_ISSOCK(ino->i_mode))
+ goto out;
+
+ ctlptr = (struct strbuf __user *)A(arg1);
+@@ -923,7 +921,7 @@
+ ino = filp->f_dentry->d_inode;
+ if (!ino) goto out;
+
+- if (!ino->i_sock &&
++ if (!IS_SOCK(ino->i_mode) &&
+ (imajor(ino) != 30 || iminor(ino) != 1))
+ goto out;
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/005-sparc64_no_i_sock-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/005-sparc64_no_i_sock-2.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/005-sparc64_no_i_sock-2.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,35 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [SPARC64]: Fix typo in previous change, s/IS_SOCK/S_ISSOCK/
+## DP: Patch author: davem@nuts.davemloft.net
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/27 21:08:40-08:00 davem@nuts.davemloft.net
+# [SPARC64]: Fix typo in previous change, s/IS_SOCK/S_ISSOCK/
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# arch/sparc64/solaris/timod.c
+# 2004/12/27 21:08:08-08:00 davem@nuts.davemloft.net +1 -1
+# [SPARC64]: Fix typo in previous change, s/IS_SOCK/S_ISSOCK/
+#
+diff -Nru a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
+--- a/arch/sparc64/solaris/timod.c 2005-01-04 17:51:52 -08:00
++++ b/arch/sparc64/solaris/timod.c 2005-01-04 17:51:52 -08:00
+@@ -921,7 +921,7 @@
+ ino = filp->f_dentry->d_inode;
+ if (!ino) goto out;
+
+- if (!IS_SOCK(ino->i_mode) &&
++ if (!S_ISSOCK(ino->i_mode) &&
+ (imajor(ino) != 30 || iminor(ino) != 1))
+ goto out;
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/006-zatm_cast_fix_fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/006-zatm_cast_fix_fix.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/006-zatm_cast_fix_fix.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,53 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] zatm fix
+## DP: Patch author: viro@parcelfarce.linux.theplanet.co.uk
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/29 10:40:39-08:00 viro@parcelfarce.linux.theplanet.co.uk
+# [PATCH] zatm fix
+#
+# Repairs the breakage introduced in gcc4 fixes. Original had expanded
+# to
+#
+# ((struct zatm_dev *)(dev)->dev_data) = zatm_dev;
+#
+# and that's what gcc4 had complained about (cast-as-lvalue). Proper fix is,
+# of course,
+#
+# dev->dev_data = zatm_dev;
+#
+# What we have in 2.6.10 is
+#
+# dev = (struct atm_dev *)zatm_dev;
+#
+# which doesn't cause complaints, but doesn't do anything good (leak + corruption
+# at the very least).
+#
+# Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/atm/zatm.c
+# 2004/12/26 22:04:22-08:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1
+# zatm fix
+#
+diff -Nru a/drivers/atm/zatm.c b/drivers/atm/zatm.c
+--- a/drivers/atm/zatm.c 2005-01-04 18:01:25 -08:00
++++ b/drivers/atm/zatm.c 2005-01-04 18:01:25 -08:00
+@@ -1605,7 +1605,7 @@
+ goto out_disable;
+
+ zatm_dev->pci_dev = pci_dev;
+- dev = (struct atm_dev *)zatm_dev;
++ dev->dev_data = zatm_dev;
+ zatm_dev->copper = (int)ent->driver_data;
+ if ((ret = zatm_init(dev)) || (ret = zatm_start(dev)))
+ goto out_release;
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,69 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [ide] fix return codes in the generic PCI IDE driver
+## DP: Patch author: bzolnier@trik.(none)
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/30 19:07:00+01:00 bzolnier@trik.(none)
+# [ide] fix return codes in the generic PCI IDE driver
+#
+# From: Alan Cox <alan@redhat.com>
+#
+# This patch updates ide/pci/generic.c to fix the incorrect returns
+# causing PCI devices to be left reserved wrongly by the driver.
+#
+# From: Francois Romieu <romieu@fr.zoreil.com>
+#
+# Use -ENODEV instead of -EAGAIN.
+#
+# Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
+#
+# drivers/ide/pci/generic.c
+# 2004/12/30 19:06:50+01:00 bzolnier@trik.(none) +8 -6
+# [ide] fix return codes in the generic PCI IDE driver
+#
+diff -Nru a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
+--- a/drivers/ide/pci/generic.c 2005-01-04 18:06:08 -08:00
++++ b/drivers/ide/pci/generic.c 2005-01-04 18:06:08 -08:00
+@@ -96,25 +96,27 @@
+ {
+ ide_pci_device_t *d = &generic_chipsets[id->driver_data];
+ u16 command;
++ int ret = -ENODEV;
+
+ if (dev->vendor == PCI_VENDOR_ID_UMC &&
+ dev->device == PCI_DEVICE_ID_UMC_UM8886A &&
+ (!(PCI_FUNC(dev->devfn) & 1)))
+- return 1; /* UM8886A/BF pair */
++ goto out; /* UM8886A/BF pair */
+
+ if (dev->vendor == PCI_VENDOR_ID_OPTI &&
+ dev->device == PCI_DEVICE_ID_OPTI_82C558 &&
+ (!(PCI_FUNC(dev->devfn) & 1)))
+- return 1;
++ goto out;
+
+ pci_read_config_word(dev, PCI_COMMAND, &command);
+- if(!(command & PCI_COMMAND_IO))
+- {
++ if (!(command & PCI_COMMAND_IO)) {
+ printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
+- return 1;
++ goto out;
+ }
++ ret = 0;
+ ide_setup_pci_device(dev, d);
+- return 0;
++out:
++ return ret;
+ }
+
+ static struct pci_device_id generic_pci_tbl[] = {
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/008-sock_without_ipv6.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/008-sock_without_ipv6.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/008-sock_without_ipv6.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] Fix net/core/sock.o build failure
+## DP: Patch author: acme@conectiva.com.br
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/30 15:21:16-08:00 acme@conectiva.com.br
+# [PATCH] Fix net/core/sock.o build failure
+#
+# This fixes a build failure that happens when you don't select IPV6.
+#
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# include/linux/ipv6.h
+# 2004/12/29 14:22:45-08:00 acme@conectiva.com.br +1 -1
+# Fix net/core/sock.o build failure
+#
+diff -Nru a/include/linux/ipv6.h b/include/linux/ipv6.h
+--- a/include/linux/ipv6.h 2005-01-04 18:11:40 -08:00
++++ b/include/linux/ipv6.h 2005-01-04 18:11:40 -08:00
+@@ -273,6 +273,7 @@
+ struct ipv6_pinfo inet6;
+ };
+
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)
+ {
+ return inet_sk(__sk)->pinet6;
+@@ -283,7 +284,6 @@
+ return &((struct raw6_sock *)__sk)->raw6;
+ }
+
+-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ #define __ipv6_only_sock(sk) (inet6_sk(sk)->ipv6only)
+ #define ipv6_only_sock(sk) ((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))
+ #else
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/009-ipt_ecn_corrupt_chksum.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/009-ipt_ecn_corrupt_chksum.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/009-ipt_ecn_corrupt_chksum.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] ipt_ECN corrupt checksum fix
+## DP: Patch author: rusty@rustcorp.com.au
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/02 09:40:33-08:00 rusty@rustcorp.com.au
+# [PATCH] ipt_ECN corrupt checksum fix
+#
+# Nasty bug, caught while writing the ECN target test. Corrupts
+# checksums of packets when target is used on them.
+#
+# Let this be a warning on the evils of casts.
+#
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# net/ipv4/netfilter/ipt_ECN.c
+# 2005/01/02 02:56:47-08:00 rusty@rustcorp.com.au +1 -1
+# ipt_ECN corrupt checksum fix
+#
+diff -Nru a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
+--- a/net/ipv4/netfilter/ipt_ECN.c 2005-01-04 18:16:39 -08:00
++++ b/net/ipv4/netfilter/ipt_ECN.c 2005-01-04 18:16:39 -08:00
+@@ -67,7 +67,7 @@
+
+ if (einfo->operation & IPT_ECN_OP_SET_CWR)
+ th->cwr = einfo->proto.tcp.cwr;
+- diffs[1] = ((u_int16_t *)&th)[6];
++ diffs[1] = ((u_int16_t *)th)[6];
+
+ /* Only mangle if it's changed. */
+ if (diffs[0] != diffs[1]) {
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/010-sparc64_macro_pmd_offset.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/010-sparc64_macro_pmd_offset.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/010-sparc64_macro_pmd_offset.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] sparc64 pmd_offset() fix
+## DP: Patch author: akpm@osdl.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/02 09:45:50-08:00 akpm@osdl.org
+# [PATCH] sparc64 pmd_offset() fix
+#
+# mm/memory.c: In function `zeromap_pud_range':
+# mm/memory.c:1053: warning: suggest parentheses around + or - inside shift
+# mm/memory.c: In function `remap_pud_range':
+# mm/memory.c:1170: warning: suggest parentheses around + or - inside shift
+#
+# Parenthesize this macro arg.
+#
+# Cc: Nick Piggin <nickpiggin@yahoo.com.au>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# include/asm-sparc64/pgtable.h
+# 2005/01/02 01:36:40-08:00 akpm@osdl.org +1 -1
+# sparc64 pmd_offset() fix
+#
+diff -Nru a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h
+--- a/include/asm-sparc64/pgtable.h 2005-01-04 18:20:52 -08:00
++++ b/include/asm-sparc64/pgtable.h 2005-01-04 18:20:52 -08:00
+@@ -315,7 +315,7 @@
+ /* Find an entry in the second-level page table.. */
+ #define pmd_offset(dir, address) \
+ ((pmd_t *) pgd_page(*(dir)) + \
+- ((address >> PMD_SHIFT) & (REAL_PTRS_PER_PMD-1)))
++ (((address) >> PMD_SHIFT) & (REAL_PTRS_PER_PMD-1)))
+
+ /* Find an entry in the third-level page table.. */
+ #define pte_index(dir, address) \
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/011-parport_pc_module_parm_mixing.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/011-parport_pc_module_parm_mixing.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/011-parport_pc_module_parm_mixing.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,52 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] parport_pc: don't mix module parameter styles
+## DP: Patch author: rddunlap@osdl.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/02 09:49:29-08:00 rddunlap@osdl.org
+# [PATCH] parport_pc: don't mix module parameter styles
+#
+# Somehow parport_pc.c ended up with mixed old-style and new-style module
+# parameters, but mixing them is not allowed.
+#
+# Use module_param() instead of MODULE_PARM() -- cannot be mixed.
+#
+# Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/parport/parport_pc.c
+# 2005/01/02 01:37:36-08:00 rddunlap@osdl.org +2 -2
+# parport_pc: don't mix module parameter styles
+#
+diff -Nru a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
+--- a/drivers/parport/parport_pc.c 2005-01-04 18:24:07 -08:00
++++ b/drivers/parport/parport_pc.c 2005-01-04 18:24:07 -08:00
+@@ -3176,7 +3176,6 @@
+ #ifdef MODULE
+ static const char *irq[PARPORT_PC_MAX_PORTS];
+ static const char *dma[PARPORT_PC_MAX_PORTS];
+-static char *init_mode;
+
+ MODULE_PARM_DESC(io, "Base I/O address (SPP regs)");
+ module_param_array(io, int, NULL, 0);
+@@ -3192,8 +3191,9 @@
+ module_param(verbose_probing, int, 0644);
+ #endif
+ #ifdef CONFIG_PCI
++static char *init_mode;
+ MODULE_PARM_DESC(init_mode, "Initialise mode for VIA VT8231 port (spp, ps2, epp, ecp or ecpepp)");
+-MODULE_PARM(init_mode, "s");
++module_param(init_mode, charp, 0);
+ #endif
+
+ static int __init parse_parport_params(void)
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/012-conntrack_standalone_proc_removal.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/012-conntrack_standalone_proc_removal.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/012-conntrack_standalone_proc_removal.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,43 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] Fix proc removal in ip_conntrack_standalone
+## DP: Patch author: rusty@rustcorp.com.au
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/02 10:46:04-08:00 rusty@rustcorp.com.au
+# [PATCH] Fix proc removal in ip_conntrack_standalone
+#
+# Someone thought it would be clever if proc code ignores removal of
+# non-existent entries. Hence, we missed that /proc/net/stat/ip_conntrack
+# is never removed on module removal or init failure.
+#
+# Found by nfsim.
+#
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# net/ipv4/netfilter/ip_conntrack_standalone.c
+# 2004/12/29 22:39:53-08:00 rusty@rustcorp.com.au +2 -2
+# Fix proc removal in ip_conntrack_standalone
+#
+diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- a/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-04 18:27:19 -08:00
++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-04 18:27:19 -08:00
+@@ -820,8 +820,8 @@
+ nf_unregister_hook(&ip_conntrack_defrag_ops);
+ cleanup_proc_stat:
+ #ifdef CONFIG_PROC_FS
+- proc_net_remove("ip_conntrack_stat");
+-cleanup_proc_exp:
++ remove_proc_entry("ip_conntrack", proc_net_stat);
++ cleanup_proc_exp:
+ proc_net_remove("ip_conntrack_expect");
+ cleanup_proc:
+ proc_net_remove("ip_conntrack");
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/013-conntrack_standalone_sysctl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/013-conntrack_standalone_sysctl.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/013-conntrack_standalone_sysctl.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] Fix cleanup path when sysctl registration fails
+## DP: Patch author: rusty@rustcorp.com.au
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/02 10:47:03-08:00 rusty@rustcorp.com.au
+# [PATCH] Fix cleanup path when sysctl registration fails
+#
+# nfsim gains sysctl support, and sure enough, --failtest uncovered an
+# unregister when the registration had failed.
+#
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# net/ipv4/netfilter/ip_conntrack_standalone.c
+# 2004/12/30 00:18:29-08:00 rusty@rustcorp.com.au +3 -1
+# Fix cleanup path when sysctl registration fails
+#
+diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- a/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-04 18:29:37 -08:00
++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-04 18:29:37 -08:00
+@@ -791,7 +791,8 @@
+ ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table, 0);
+ if (ip_ct_sysctl_header == NULL) {
+ printk("ip_conntrack: can't register to sysctl.\n");
+- goto cleanup;
++ ret = -ENOMEM;
++ goto cleanup_localinops;
+ }
+ #endif
+
+@@ -800,6 +801,7 @@
+ cleanup:
+ #ifdef CONFIG_SYSCTL
+ unregister_sysctl_table(ip_ct_sysctl_header);
++ cleanup_localinops:
+ #endif
+ nf_unregister_hook(&ip_conntrack_local_in_ops);
+ cleanup_inoutandlocalops:
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/014-acpi_video_dev_slab_corruption.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/014-acpi_video_dev_slab_corruption.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/014-acpi_video_dev_slab_corruption.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: acpi video device enumeration: fix incorrect device list allocation
+## DP: Patch author: torvalds@evo.osdl.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/02 11:45:13-08:00 torvalds@evo.osdl.org
+# acpi video device enumeration: fix incorrect device list allocation
+#
+# It didn't allocate space for the final terminating entry,
+# which caused it to overwrite the next slab entry, which in turn
+# sometimes ended up being a slab array cache pointer. End result:
+# total slab cache corruption at a random time afterwards. Very
+# nasty.
+#
+# drivers/acpi/video.c
+# 2005/01/02 11:45:03-08:00 torvalds@evo.osdl.org +1 -1
+# acpi video device enumeration: fix incorrect device list allocation
+#
+# It didn't allocate space for the final terminating entry,
+# which caused it to overwrite the next slab entry, which in turn
+# sometimes ended up being a slab array cache pointer. End result:
+# total slab cache corruption at a random time afterwards. Very
+# nasty.
+#
+diff -Nru a/drivers/acpi/video.c b/drivers/acpi/video.c
+--- a/drivers/acpi/video.c 2005-01-04 18:35:02 -08:00
++++ b/drivers/acpi/video.c 2005-01-04 18:35:02 -08:00
+@@ -1524,7 +1524,7 @@
+ dod->package.count));
+
+ active_device_list= kmalloc(
+- dod->package.count*sizeof(struct acpi_video_enumerated_device),
++ (1+dod->package.count)*sizeof(struct acpi_video_enumerated_device),
+ GFP_KERNEL);
+
+ if (!active_device_list) {
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/015-vmscan_total_scanned.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/015-vmscan_total_scanned.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/015-vmscan_total_scanned.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] vmscan: total_scanned fix
+## DP: Patch author: akpm@osdl.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/03 20:13:49-08:00 akpm@osdl.org
+# [PATCH] vmscan: total_scanned fix
+#
+# We haven't been incrementing local variable total_scanned since the
+# scan_control stuff went in. That broke kswapd throttling.
+#
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# mm/vmscan.c
+# 2005/01/03 15:50:40-08:00 akpm@osdl.org +1 -0
+# vmscan: total_scanned fix
+#
+diff -Nru a/mm/vmscan.c b/mm/vmscan.c
+--- a/mm/vmscan.c 2005-01-04 18:39:05 -08:00
++++ b/mm/vmscan.c 2005-01-04 18:39:05 -08:00
+@@ -1063,6 +1063,7 @@
+ shrink_slab(sc.nr_scanned, GFP_KERNEL, lru_pages);
+ sc.nr_reclaimed += reclaim_state->reclaimed_slab;
+ total_reclaimed += sc.nr_reclaimed;
++ total_scanned += sc.nr_scanned;
+ if (zone->all_unreclaimable)
+ continue;
+ if (zone->pages_scanned >= (zone->nr_active +
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/016-cs461x_gameport.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/016-cs461x_gameport.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/016-cs461x_gameport.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,43 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] CS461x gameport code isn't being included in build
+## DP: Patch author: rjmx@rjmx.net
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/03 20:14:02-08:00 rjmx@rjmx.net
+# [PATCH] CS461x gameport code isn't being included in build
+#
+# With Cal Peake <cp@absolutedigital.net>
+#
+# I've found a typo in drivers/input/gameport/Makefile in kernel 2.6.9 which
+# effectively prevents the CS461x gameport code from being included.
+#
+# Signed-off-by: Ron Murray <rjmx@rjmx.net>
+# Signed-off-by: Cal Peake <cp@absolutedigital.net>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/input/gameport/Makefile
+# 2005/01/03 15:49:13-08:00 rjmx@rjmx.net +1 -1
+# CS461x gameport code isn't being included in build
+#
+diff -Nru a/drivers/input/gameport/Makefile b/drivers/input/gameport/Makefile
+--- a/drivers/input/gameport/Makefile 2005-01-04 18:39:49 -08:00
++++ b/drivers/input/gameport/Makefile 2005-01-04 18:39:49 -08:00
+@@ -5,7 +5,7 @@
+ # Each configuration option enables a list of files.
+
+ obj-$(CONFIG_GAMEPORT) += gameport.o
+-obj-$(CONFIG_GAMEPORT_CS461X) += cs461x.o
++obj-$(CONFIG_GAMEPORT_CS461x) += cs461x.o
+ obj-$(CONFIG_GAMEPORT_EMU10K1) += emu10k1-gp.o
+ obj-$(CONFIG_GAMEPORT_FM801) += fm801-gp.o
+ obj-$(CONFIG_GAMEPORT_L4) += lightning.o
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/017-conntrack_sctp_sysctl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/017-conntrack_sctp_sysctl.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/017-conntrack_sctp_sysctl.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,57 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] netfilter: Fix ip_conntrack_proto_sctp exit on sysctl fail
+## DP: Patch author: rusty@rustcorp.com.au
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/03 20:18:05-08:00 rusty@rustcorp.com.au
+# [PATCH] netfilter: Fix ip_conntrack_proto_sctp exit on sysctl fail
+#
+# On failure from register_sysctl_table, we return with exit 0. Oops. init and
+# fini should also be static. nfsim found these.
+#
+# Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# net/ipv4/netfilter/ip_conntrack_proto_sctp.c
+# 2005/01/03 15:49:16-08:00 rusty@rustcorp.com.au +3 -2
+# netfilter: Fix ip_conntrack_proto_sctp exit on sysctl fail
+#
+diff -Nru a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c 2005-01-04 18:46:31 -08:00
++++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c 2005-01-04 18:46:31 -08:00
+@@ -609,7 +609,7 @@
+ static struct ctl_table_header *ip_ct_sysctl_header;
+ #endif
+
+-int __init init(void)
++static int __init init(void)
+ {
+ int ret;
+
+@@ -622,6 +622,7 @@
+ #ifdef CONFIG_SYSCTL
+ ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table, 0);
+ if (ip_ct_sysctl_header == NULL) {
++ ret = -ENOMEM;
+ printk("ip_conntrack_proto_sctp: can't register to sysctl.\n");
+ goto cleanup;
+ }
+@@ -639,7 +640,7 @@
+ return ret;
+ }
+
+-void __exit fini(void)
++static void __exit fini(void)
+ {
+ ip_conntrack_protocol_unregister(&ip_conntrack_protocol_sctp);
+ #ifdef CONFIG_SYSCTL
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/018-ipt_recent_proc_remove.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/018-ipt_recent_proc_remove.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/018-ipt_recent_proc_remove.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,52 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] netfilter: Fix cleanup in ipt_recent should ipt_registrater_match error
+## DP: Patch author: rusty@rustcorp.com.au
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/03 20:19:17-08:00 rusty@rustcorp.com.au
+# [PATCH] netfilter: Fix cleanup in ipt_recent should ipt_registrater_match error
+#
+# When ipt_registrater_match() fails, ipt_recent doesn't remove its proc
+# entry. Found by nfsim.
+#
+# Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# net/ipv4/netfilter/ipt_recent.c
+# 2005/01/03 15:49:17-08:00 rusty@rustcorp.com.au +5 -2
+# netfilter: Fix cleanup in ipt_recent should ipt_registrater_match error
+#
+diff -Nru a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
+--- a/net/ipv4/netfilter/ipt_recent.c 2005-01-04 18:49:55 -08:00
++++ b/net/ipv4/netfilter/ipt_recent.c 2005-01-04 18:49:55 -08:00
+@@ -959,7 +959,7 @@
+ /* Kernel module initialization. */
+ static int __init init(void)
+ {
+- int count;
++ int err, count;
+
+ printk(version);
+ #ifdef CONFIG_PROC_FS
+@@ -983,7 +983,10 @@
+ if(debug) printk(KERN_INFO RECENT_NAME ": ip_list_hash_size: %d\n",ip_list_hash_size);
+ #endif
+
+- return ipt_register_match(&recent_match);
++ err = ipt_register_match(&recent_match);
++ if (err)
++ remove_proc_entry("ipt_recent", proc_net);
++ return err;
+ }
+
+ /* Kernel module destruction. */
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/019-conntrack_tcp_RST_handling.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/019-conntrack_tcp_RST_handling.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/019-conntrack_tcp_RST_handling.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] Fix broken RST handling in ip_conntrack
+## DP: Patch author: gandalf@netfilter.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/03 20:19:30-08:00 gandalf@netfilter.org
+# [PATCH] Fix broken RST handling in ip_conntrack
+#
+# Here's a patch that fixes a pretty serious bug introduced by a recent
+# "bugfix". The problem is that RST packets are ignored if they follow an
+# ACK packet, this means that the timeout of the connection isn't decreased,
+# so we get lots of old connections lingering around until the timeout
+# expires, the default timeout for state ESTABLISHED is 5 days.
+#
+# This needs to go into -bk as soon as possible. The bug is present in
+# 2.6.10 as well.
+#
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+# 2005/01/03 15:49:17-08:00 gandalf@netfilter.org +2 -1
+# Fix broken RST handling in ip_conntrack
+#
+diff -Nru a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-01-04 18:58:34 -08:00
++++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-01-04 18:58:34 -08:00
+@@ -906,7 +906,8 @@
+ if (index == TCP_RST_SET
+ && ((test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status)
+ && conntrack->proto.tcp.last_index <= TCP_SYNACK_SET)
+- || conntrack->proto.tcp.last_index == TCP_ACK_SET)
++ || (!test_bit(IPS_ASSURED_BIT, &conntrack->status)
++ && conntrack->proto.tcp.last_index == TCP_ACK_SET))
+ && after(ntohl(th->ack_seq),
+ conntrack->proto.tcp.last_seq)) {
+ /* Ignore RST closing down invalid SYN or ACK
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/020-clear_cyrix_mii_ecx_reg.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/020-clear_cyrix_mii_ecx_reg.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/020-clear_cyrix_mii_ecx_reg.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,110 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] Cyrix MII cpuid returns stale %ecx
+## DP: Patch author: zwane@linuxpower.ca
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/03 20:41:13-08:00 zwane@linuxpower.ca
+# [PATCH] Cyrix MII cpuid returns stale %ecx
+#
+# This patch is for the following bug, thanks to Ondrej Zary for reporting,
+# testing and submitting a patch.
+#
+# http://bugzilla.kernel.org/show_bug.cgi?id=3767
+#
+# It appears that the Cyrix MII won't touch %ecx at all resulting in stale
+# data being returned as extended attributes, so clear ecx before issuing the
+# cpuid. I have also made the capability print code display all the
+# capability words for easier debugging in future.
+#
+# Signed-off-by: Zwane Mwaikambo <zwane@linuxpower.ca>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# arch/i386/kernel/cpu/common.c
+# 2005/01/03 15:49:21-08:00 zwane@linuxpower.ca +13 -16
+# Cyrix MII cpuid returns stale %ecx
+#
+# include/asm-i386/processor.h
+# 2005/01/03 15:50:31-08:00 zwane@linuxpower.ca +3 -1
+# Cyrix MII cpuid returns stale %ecx
+#
+diff -Nru a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
+--- a/arch/i386/kernel/cpu/common.c 2005-01-04 19:29:52 -08:00
++++ b/arch/i386/kernel/cpu/common.c 2005-01-04 19:29:52 -08:00
+@@ -334,21 +334,19 @@
+
+ generic_identify(c);
+
+- printk(KERN_DEBUG "CPU: After generic identify, caps: %08lx %08lx %08lx %08lx\n",
+- c->x86_capability[0],
+- c->x86_capability[1],
+- c->x86_capability[2],
+- c->x86_capability[3]);
++ printk(KERN_DEBUG "CPU: After generic identify, caps:");
++ for (i = 0; i < NCAPINTS; i++)
++ printk(" %08lx", c->x86_capability[i]);
++ printk("\n");
+
+ if (this_cpu->c_identify) {
+ this_cpu->c_identify(c);
+
+- printk(KERN_DEBUG "CPU: After vendor identify, caps: %08lx %08lx %08lx %08lx\n",
+- c->x86_capability[0],
+- c->x86_capability[1],
+- c->x86_capability[2],
+- c->x86_capability[3]);
+-}
++ printk(KERN_DEBUG "CPU: After vendor identify, caps:");
++ for (i = 0; i < NCAPINTS; i++)
++ printk(" %08lx", c->x86_capability[i]);
++ printk("\n");
++ }
+
+ /*
+ * Vendor-specific initialization. In this section we
+@@ -398,11 +396,10 @@
+
+ /* Now the feature flags better reflect actual CPU features! */
+
+- printk(KERN_DEBUG "CPU: After all inits, caps: %08lx %08lx %08lx %08lx\n",
+- c->x86_capability[0],
+- c->x86_capability[1],
+- c->x86_capability[2],
+- c->x86_capability[3]);
++ printk(KERN_DEBUG "CPU: After all inits, caps:");
++ for (i = 0; i < NCAPINTS; i++)
++ printk(" %08lx", c->x86_capability[i]);
++ printk("\n");
+
+ /*
+ * On SMP, boot_cpu_data holds the common feature set between
+diff -Nru a/include/asm-i386/processor.h b/include/asm-i386/processor.h
+--- a/include/asm-i386/processor.h 2005-01-04 19:29:52 -08:00
++++ b/include/asm-i386/processor.h 2005-01-04 19:29:52 -08:00
+@@ -126,6 +126,8 @@
+
+ /*
+ * Generic CPUID function
++ * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx
++ * resulting in stale register contents being returned.
+ */
+ static inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx)
+ {
+@@ -134,7 +136,7 @@
+ "=b" (*ebx),
+ "=c" (*ecx),
+ "=d" (*edx)
+- : "0" (op));
++ : "0" (op), "c"(0));
+ }
+
+ /*
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/021-sunrpc_check_before_kill.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/021-sunrpc_check_before_kill.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/021-sunrpc_check_before_kill.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,71 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: RPC: Fix a bug in rpc_killall_tasks().
+## DP: Patch author: trond.myklebust@fys.uio.no
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/04 19:35:12+01:00 trond.myklebust@fys.uio.no
+# RPC: Fix a bug in rpc_killall_tasks().
+#
+# Shirly Ma reported seeing problems with rpc_killall_tasks() causing
+# the task->tk_magic debugging test to trigger. It turns out we may be
+# killing tasks that are not yet running or even initialized.
+#
+# Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+#
+# net/sunrpc/sched.c
+# 2005/01/04 01:00:00+01:00 trond.myklebust@fys.uio.no +9 -6
+# RPC: Fix a bug in rpc_killall_tasks().
+#
+diff -Nru a/net/sunrpc/sched.c b/net/sunrpc/sched.c
+--- a/net/sunrpc/sched.c 2005-01-04 19:45:47 -08:00
++++ b/net/sunrpc/sched.c 2005-01-04 19:45:47 -08:00
+@@ -762,11 +762,6 @@
+ if (!RPC_IS_ASYNC(task))
+ init_waitqueue_head(&task->u.tk_wait.waitq);
+
+- /* Add to global list of all tasks */
+- spin_lock(&rpc_sched_lock);
+- list_add(&task->tk_task, &all_tasks);
+- spin_unlock(&rpc_sched_lock);
+-
+ if (clnt) {
+ atomic_inc(&clnt->cl_users);
+ if (clnt->cl_softrtry)
+@@ -779,6 +774,11 @@
+ task->tk_magic = 0xf00baa;
+ task->tk_pid = rpc_task_id++;
+ #endif
++ /* Add to global list of all tasks */
++ spin_lock(&rpc_sched_lock);
++ list_add_tail(&task->tk_task, &all_tasks);
++ spin_unlock(&rpc_sched_lock);
++
+ dprintk("RPC: %4d new task procpid %d\n", task->tk_pid,
+ current->pid);
+ }
+@@ -952,12 +952,15 @@
+ * Spin lock all_tasks to prevent changes...
+ */
+ spin_lock(&rpc_sched_lock);
+- alltask_for_each(rovr, le, &all_tasks)
++ alltask_for_each(rovr, le, &all_tasks) {
++ if (! RPC_IS_ACTIVATED(rovr))
++ continue;
+ if (!clnt || rovr->tk_client == clnt) {
+ rovr->tk_flags |= RPC_TASK_KILLED;
+ rpc_exit(rovr, -EIO);
+ rpc_wake_up_task(rovr);
+ }
++ }
+ spin_unlock(&rpc_sched_lock);
+ }
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/022-sunrpc_xdr_flush_pages.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/022-sunrpc_xdr_flush_pages.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/022-sunrpc_xdr_flush_pages.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,57 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: RPC: Add missing calls to flush_dcache_page() in net/sunrpc/xdr.c
+## DP: Patch author: trond.myklebust@fys.uio.no
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/04 19:36:01+01:00 trond.myklebust@fys.uio.no
+# RPC: Add missing calls to flush_dcache_page() in net/sunrpc/xdr.c
+#
+# Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+#
+# net/sunrpc/xdr.c
+# 2005/01/04 01:00:00+01:00 trond.myklebust@fys.uio.no +4 -0
+# RPC: Add missing calls to flush_dcache_page() in net/sunrpc/xdr.c
+#
+diff -Nru a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
+--- a/net/sunrpc/xdr.c 2005-01-04 19:53:04 -08:00
++++ b/net/sunrpc/xdr.c 2005-01-04 19:53:04 -08:00
+@@ -371,6 +371,7 @@
+ do {
+ /* Are any pointers crossing a page boundary? */
+ if (pgto_base == 0) {
++ flush_dcache_page(*pgto);
+ pgto_base = PAGE_CACHE_SIZE;
+ pgto--;
+ }
+@@ -394,6 +395,7 @@
+ kunmap_atomic(vto, KM_USER0);
+
+ } while ((len -= copy) != 0);
++ flush_dcache_page(*pgto);
+ }
+
+ /*
+@@ -427,12 +429,14 @@
+
+ pgbase += copy;
+ if (pgbase == PAGE_CACHE_SIZE) {
++ flush_dcache_page(*pgto);
+ pgbase = 0;
+ pgto++;
+ }
+ p += copy;
+
+ } while ((len -= copy) != 0);
++ flush_dcache_page(*pgto);
+ }
+
+ /*
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/023-nfs_dentry_refcount.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/023-nfs_dentry_refcount.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/023-nfs_dentry_refcount.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,49 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: NFS: Fix dentry refcount accounting error which causes unnecessary
+## DP: Patch author: trond.myklebust@fys.uio.no
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/04 19:43:24+01:00 trond.myklebust@fys.uio.no
+# NFS: Fix dentry refcount accounting error which causes unnecessary
+# sillyrenames when renaming to an existing file.
+#
+# Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
+# Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
+#
+# fs/nfs/dir.c
+# 2005/01/04 01:00:00+01:00 trond.myklebust@fys.uio.no +2 -4
+# NFS: Fix dentry refcount accounting error which causes unnecessary
+#
+diff -Nru a/fs/nfs/dir.c b/fs/nfs/dir.c
+--- a/fs/nfs/dir.c 2005-01-04 19:56:57 -08:00
++++ b/fs/nfs/dir.c 2005-01-04 19:56:57 -08:00
+@@ -1382,7 +1382,7 @@
+ goto go_ahead;
+ if (S_ISDIR(new_inode->i_mode))
+ goto out;
+- else if (atomic_read(&new_dentry->d_count) > 1) {
++ else if (atomic_read(&new_dentry->d_count) > 2) {
+ int err;
+ /* copy the target dentry's name */
+ dentry = d_alloc(new_dentry->d_parent,
+@@ -1397,10 +1397,8 @@
+ new_inode = NULL;
+ /* instantiate the replacement target */
+ d_instantiate(new_dentry, NULL);
+- }
+-
++ } else if (atomic_read(&new_dentry->d_count) > 1) {
+ /* dentry still busy? */
+- if (atomic_read(&new_dentry->d_count) > 1) {
+ #ifdef NFS_PARANOIA
+ printk("nfs_rename: target %s/%s busy, d_count=%d\n",
+ new_dentry->d_parent->d_name.name,
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/024-nfs_incorrect_df_output.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/024-nfs_incorrect_df_output.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/024-nfs_incorrect_df_output.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,60 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Subject: [PATCH] NFS: incorrect "df" results
+## DP: Patch author: trond.myklebust@fys.uio.no
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/04 19:48:45+01:00 trond.myklebust@fys.uio.no
+# Subject: [PATCH] NFS: incorrect "df" results
+#
+# Description:
+# Fix an NFS client bug introduced in 2.6.9-rc1. The "df" command was
+# reporting the size of NFS file systems incorrectly.
+#
+# Signed-off-by: Chuck Lever <cel@netapp.com>
+# Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
+#
+# fs/nfs/inode.c
+# 2005/01/04 01:00:00+01:00 trond.myklebust@fys.uio.no +15 -1
+# Subject: [PATCH] NFS: incorrect "df" results
+#
+diff -Nru a/fs/nfs/inode.c b/fs/nfs/inode.c
+--- a/fs/nfs/inode.c 2005-01-04 19:59:27 -08:00
++++ b/fs/nfs/inode.c 2005-01-04 19:59:27 -08:00
+@@ -486,13 +486,27 @@
+ if (error < 0)
+ goto out_err;
+
+- buf->f_frsize = server->wtmult;
++ /*
++ * Current versions of glibc do not correctly handle the
++ * case where f_frsize != f_bsize. Eventually we want to
++ * report the value of wtmult in this field.
++ */
++ buf->f_frsize = sb->s_blocksize;
++
++ /*
++ * On most *nix systems, f_blocks, f_bfree, and f_bavail
++ * are reported in units of f_frsize. Linux hasn't had
++ * an f_frsize field in its statfs struct until recently,
++ * thus historically Linux's sys_statfs reports these
++ * fields in units of f_bsize.
++ */
+ buf->f_bsize = sb->s_blocksize;
+ blockbits = sb->s_blocksize_bits;
+ blockres = (1 << blockbits) - 1;
+ buf->f_blocks = (res.tbytes + blockres) >> blockbits;
+ buf->f_bfree = (res.fbytes + blockres) >> blockbits;
+ buf->f_bavail = (res.abytes + blockres) >> blockbits;
++
+ buf->f_files = res.tfiles;
+ buf->f_ffree = res.afiles;
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/025-track_dummy_capability.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/025-track_dummy_capability.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/025-track_dummy_capability.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,61 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] track capabilities in default dummy security module code
+## DP: Patch author: chrisw@osdl.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/04 13:54:13-08:00 chrisw@osdl.org
+# [PATCH] track capabilities in default dummy security module code
+#
+# Switch dummy logic around to set cap_* bits during exec and set*uid based
+# on basic uid check. Then check cap_* bits during capable() (rather than
+# doing basic uid check). This ensures that capability bits are properly
+# initialized in case the capability module is later loaded.
+#
+# Signed-off-by: Chris Wright <chrisw@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# security/dummy.c
+# 2005/01/04 13:14:10-08:00 chrisw@osdl.org +3 -4
+# track capabilities in default dummy security module code
+#
+diff -Nru a/security/dummy.c b/security/dummy.c
+--- a/security/dummy.c 2005-01-04 20:00:14 -08:00
++++ b/security/dummy.c 2005-01-04 20:00:14 -08:00
+@@ -74,11 +74,8 @@
+
+ static int dummy_capable (struct task_struct *tsk, int cap)
+ {
+- if (cap_is_fs_cap (cap) ? tsk->fsuid == 0 : tsk->euid == 0)
+- /* capability granted */
++ if (cap_raised (tsk->cap_effective, cap))
+ return 0;
+-
+- /* capability denied */
+ return -EPERM;
+ }
+
+@@ -183,6 +180,7 @@
+
+ static void dummy_bprm_free_security (struct linux_binprm *bprm)
+ {
++ dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted);
+ return;
+ }
+
+@@ -558,6 +556,7 @@
+
+ static int dummy_task_post_setuid (uid_t id0, uid_t id1, uid_t id2, int flags)
+ {
++ dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted);
+ return 0;
+ }
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/026-nfs_o_direct_error.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/026-nfs_o_direct_error.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/026-nfs_o_direct_error.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] NFS client O_DIRECT error case fix
+## DP: Patch author: brugolsky@telemetry-investments.com
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/04 15:57:25-08:00 brugolsky@telemetry-investments.com
+# [PATCH] NFS client O_DIRECT error case fix
+#
+# The NFS direct-io error return path for request sizes greater than
+# MAX_DIRECTIO_SIZE fails to initialize the returned page struct array
+# pointer to NULL.
+#
+# Discovered using AKPM's ext3-tools: odwrite -ko 0 16385 foo
+#
+# Signed-off-by: Bill Rugolsky <brugolsky@telemetry-investments.com>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# fs/nfs/direct.c
+# 2005/01/04 13:55:37-08:00 brugolsky@telemetry-investments.com +3 -1
+# NFS client O_DIRECT error case fix
+#
+diff -Nru a/fs/nfs/direct.c b/fs/nfs/direct.c
+--- a/fs/nfs/direct.c 2005-01-04 20:03:28 -08:00
++++ b/fs/nfs/direct.c 2005-01-04 20:03:28 -08:00
+@@ -72,8 +72,10 @@
+ size_t array_size;
+
+ /* set an arbitrary limit to prevent arithmetic overflow */
+- if (size > MAX_DIRECTIO_SIZE)
++ if (size > MAX_DIRECTIO_SIZE) {
++ *pages = NULL;
+ return -EFBIG;
++ }
+
+ page_count = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ page_count -= user_addr >> PAGE_SHIFT;
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/027-track_dummy_capability-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/027-track_dummy_capability-2.dpatch 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/027-track_dummy_capability-2.dpatch 2005-01-05 04:48:30 UTC (rev 2127)
@@ -0,0 +1,50 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] fix up dummy security module code merge
+## DP: Patch author: chrisw@osdl.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/04 15:59:03-08:00 chrisw@osdl.org
+# [PATCH] fix up dummy security module code merge
+#
+# OK, somehow I managed to botch this one. It happens to work fine, but I
+# should have been more careful with forward porting this 1+ year old patch.
+# The exec-time calc should go in bprm_apply_creds, not bprm_free_security.
+#
+# Thanks to Stephen for spotting my mistake.
+#
+# Signed-off-by: Chris Wright <chrisw@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# security/dummy.c
+# 2005/01/04 14:45:31-08:00 chrisw@osdl.org +2 -1
+# fix up dummy security module code merge
+#
+diff -Nru a/security/dummy.c b/security/dummy.c
+--- a/security/dummy.c 2005-01-04 20:05:02 -08:00
++++ b/security/dummy.c 2005-01-04 20:05:02 -08:00
+@@ -180,7 +180,6 @@
+
+ static void dummy_bprm_free_security (struct linux_binprm *bprm)
+ {
+- dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted);
+ return;
+ }
+
+@@ -197,6 +196,8 @@
+
+ current->suid = current->euid = current->fsuid = bprm->e_uid;
+ current->sgid = current->egid = current->fsgid = bprm->e_gid;
++
++ dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted);
+ }
+
+ static int dummy_bprm_set_security (struct linux_binprm *bprm)
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1 2005-01-03 10:13:06 UTC (rev 2126)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1 2005-01-05 04:48:30 UTC (rev 2127)
@@ -47,3 +47,30 @@
+ powerpc-pegasos-2.dpatch
+ powerpc-pegasos-via82cxxx.dpatch
+ powerpc-serial.dpatch
++ 001-acpi_ibm_exit.dpatch
++ 002-pio_err_handling.dpatch
++ 003-libata_alpha_build_fix.dpatch
++ 004-sparc64_no_i_sock.dpatch
++ 005-sparc64_no_i_sock-2.dpatch
++ 006-zatm_cast_fix_fix.dpatch
++ 007-pci_ide_no_reserve.dpatch
++ 008-sock_without_ipv6.dpatch
++ 009-ipt_ecn_corrupt_chksum.dpatch
++ 010-sparc64_macro_pmd_offset.dpatch
++ 011-parport_pc_module_parm_mixing.dpatch
++ 012-conntrack_standalone_proc_removal.dpatch
++ 013-conntrack_standalone_sysctl.dpatch
++ 014-acpi_video_dev_slab_corruption.dpatch
++ 015-vmscan_total_scanned.dpatch
++ 016-cs461x_gameport.dpatch
++ 017-conntrack_sctp_sysctl.dpatch
++ 018-ipt_recent_proc_remove.dpatch
++ 019-conntrack_tcp_RST_handling.dpatch
++ 020-clear_cyrix_mii_ecx_reg.dpatch
++ 021-sunrpc_check_before_kill.dpatch
++ 022-sunrpc_xdr_flush_pages.dpatch
++ 023-nfs_dentry_refcount.dpatch
++ 024-nfs_incorrect_df_output.dpatch
++ 025-track_dummy_capability.dpatch
++ 026-nfs_o_direct_error.dpatch
++ 027-track_dummy_capability-2.dpatch