r2316 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series
Andres Salomon
dilinger-guest@costa.debian.org
Tue, 18 Jan 2005 08:29:40 +0100
Author: dilinger-guest
Date: 2005-01-18 08:29:39 +0100 (Tue, 18 Jan 2005)
New Revision: 2316
Added:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/036-rlimit_memlock_check-2.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/037-sctp_err_lookup_oops.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/038-ftdi_sio_debug_output.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/039-serial_console_resume.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/040-sk_forward_alloc_underflow.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/041-ide_hwif_supress_busy.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/042-gx_get_cpuspeed_return_value.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/043-dothan_p4_get_frequency.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/044-elevator_noop_add_request.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/045-pci_psycho_brainfart.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/046-ipv6_sit_lock.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/047-do_tcp_sendpages_tso_assertion.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/048-matroxfb_mtrr_ifdef.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/050-cfq_requeue_request_accounting.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-4
Log:
synch with 2.6.10-as2
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-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-18 07:29:39 UTC (rev 2316)
@@ -46,6 +46,60 @@
* More modular-vesafb updates/cleanups (Andres Salomon).
+ * [SECURITY] 036-rlimit_memlock_check-2.dpatch
+ Add missing memory check; needed by 033-rlimit_memlock_check.patch
+ (Andres Salomon).
+
+ * 037-sctp_err_lookup_oops.dpatch
+ In case of an error, sk never gets set; thus, sock_put(sk) messes up
+ (Andres Salomon).
+
+ * 038-ftdi_sio_debug_output.dpatch
+ Make ftdi_sio driver output debug message instead of error if attempting
+ to write 0 bytes (Andres Salomon).
+
+ * 039-serial_console_resume.dpatch
+ Don't assume a port has a tty associated w/ it when resuming
+ (Andres Salomon).
+
+ * 040-sk_forward_alloc_underflow.dpatch
+ Do not underflow sk_forward_alloc from tcp_sendpage (Andres Salomon).
+
+ * 041-ide_hwif_supress_busy.dpatch
+ While probing ide interfaces, supress error messages for non-existent
+ ones (Andres Salomon).
+
+ * 042-gx_get_cpuspeed_return_value.dpatch
+ gx_get_cpuspeed was returning the wrong value; this fixes it (Andres
+ Salomon).
+
+ * 043-dothan_p4_get_frequency.dpatch
+ Pentium M (Dothan) model is 0x0d, not 0x13 (Andres Salomon).
+
+ * 044-elevator_noop_add_request.dpatch
+ elevator_noop_add_request() ignored the 'where' arg, which specified
+ where the request should be added (front, back..) (Andres Salomon).
+
+ * [SPARC64] 045-pci_psycho_brainfart.dpatch
+ Incorrect register values are used inside __psycho_check_one_stc if
+ PBM type is B (Andres Salomon).
+
+ * 046-ipv6_sit_lock.dpatch
+ Fix locking issue inside ipip6_tunnel_link() (Andres Salomon).
+
+ * 047-do_tcp_sendpages_tso_assertion.dpatch
+ do_tcp_sendpages() didn't track skb->truesize correctly; this causes
+ partially ACK'd TSO frames to potentially corrupt stuff as
+ skb->truesize is too small (Andres Salomon).
+
+ * 048-matroxfb_mtrr_ifdef.dpatch
+ The mtrr stuff in the matroxfb driver needs to be wrapped w/ CONFIG_MTRR
+ ifdefs (Andres Salomon).
+
+ * 050-cfq_requeue_request_accounting.dpatch
+ cfq_requeue_request can potentially decrement a counter past 0; we want
+ to only decrement it if it's > 0 (Andres Salomon).
+
-- Sven Luther <luther@debian.org> Mon, 10 Jan 2005 18:06:29 +0100
kernel-source-2.6.10 (2.6.10-3) unstable; urgency=low
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/036-rlimit_memlock_check-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/036-rlimit_memlock_check-2.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/036-rlimit_memlock_check-2.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] acct_stack_growth nitpicks
+## 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/11 07:40:07-08:00 chrisw@osdl.org
+# [PATCH] acct_stack_growth nitpicks
+#
+# - allow CAP_IPC_LOCK to override mlock rlimit during stack expansion as
+# in all other cases
+#
+# Signed-off-by: Chris Wright <chrisw@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# mm/mmap.c
+# 2005/01/10 19:34:05-08:00 chrisw@osdl.org +1 -1
+# acct_stack_growth nitpicks
+#
+diff -Nru a/mm/mmap.c b/mm/mmap.c
+--- a/mm/mmap.c 2005-01-15 13:03:38 -08:00
++++ b/mm/mmap.c 2005-01-15 13:03:38 -08:00
+@@ -1359,7 +1359,7 @@
+ unsigned long limit;
+ locked = mm->locked_vm + grow;
+ limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
+- if (locked > limit)
++ if (locked > limit && !capable(CAP_IPC_LOCK))
+ return -ENOMEM;
+ }
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/037-sctp_err_lookup_oops.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/037-sctp_err_lookup_oops.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/037-sctp_err_lookup_oops.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [SCTP] Fix potential null pointer dereference in sctp_err_lookup().
+## DP: Patch author: sri@us.ibm.com
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/24 22:33:13-08:00 sri@us.ibm.com
+# [SCTP] Fix potential null pointer dereference in sctp_err_lookup().
+#
+# Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
+# Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
+#
+# net/sctp/input.c
+# 2004/12/24 22:33:04-08:00 sri@us.ibm.com +2 -1
+# [SCTP] Fix potential null pointer dereference in sctp_err_lookup().
+#
+diff -Nru a/net/sctp/input.c b/net/sctp/input.c
+--- a/net/sctp/input.c 2005-01-15 13:40:55 -08:00
++++ b/net/sctp/input.c 2005-01-15 13:40:55 -08:00
+@@ -326,11 +326,12 @@
+ }
+
+ if (asoc) {
++ sk = asoc->base.sk;
++
+ if (ntohl(sctphdr->vtag) != asoc->c.peer_vtag) {
+ ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
+ goto out;
+ }
+- sk = asoc->base.sk;
+ } else
+ sk = ep->base.sk;
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/038-ftdi_sio_debug_output.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/038-ftdi_sio_debug_output.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/038-ftdi_sio_debug_output.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: USB: change warning level in ftdi_sio driver of a debug message.
+## DP: Patch author: greg@kroah.com
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/12/20 10:37:42-08:00 greg@kroah.com
+# USB: change warning level in ftdi_sio driver of a debug message.
+#
+# This keeps users happy as it really isn't an error.
+#
+# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
+#
+# drivers/usb/serial/ftdi_sio.c
+# 2004/12/20 10:37:18-08:00 greg@kroah.com +1 -1
+# USB: change warning level in ftdi_sio driver of a debug message.
+#
+# This keeps users happy as it really isn't an error.
+#
+# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
+#
+diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
+--- a/drivers/usb/serial/ftdi_sio.c 2005-01-15 15:16:48 -08:00
++++ b/drivers/usb/serial/ftdi_sio.c 2005-01-15 15:16:48 -08:00
+@@ -1651,7 +1651,7 @@
+ dbg("%s port %d, %d bytes", __FUNCTION__, port->number, count);
+
+ if (count == 0) {
+- err("write request of 0 bytes");
++ dbg("write request of 0 bytes");
+ return 0;
+ }
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/039-serial_console_resume.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/039-serial_console_resume.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/039-serial_console_resume.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -0,0 +1,55 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [SERIAL] Fix serial console resume
+## DP: Patch author: rmk@flint.arm.linux.org.uk
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/15 11:42:19+00:00 rmk@flint.arm.linux.org.uk
+# [SERIAL] Fix serial console resume
+#
+# Don't use uart_change_speed() when trying to restore the serial
+# console settings - the port may not have a tty associated with
+# it.
+#
+# Signed-off-by: Russell King <rmk@arm.linux.org.uk>
+#
+# drivers/serial/serial_core.c
+# 2005/01/15 11:37:07+00:00 rmk@flint.arm.linux.org.uk +15 -1
+# Don't use uart_change_speed() when trying to restore the serial
+# console settings - the port may not have a tty associated with
+# it.
+#
+diff -Nru a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
+--- a/drivers/serial/serial_core.c 2005-01-15 15:47:37 -08:00
++++ b/drivers/serial/serial_core.c 2005-01-15 15:47:37 -08:00
+@@ -1877,7 +1877,21 @@
+ * Re-enable the console device after suspending.
+ */
+ if (uart_console(port)) {
+- uart_change_speed(state, NULL);
++ struct termios termios;
++
++ /*
++ * First try to use the console cflag setting.
++ */
++ memset(&termios, 0, sizeof(struct termios));
++ termios.c_cflag = port->cons->cflag;
++
++ /*
++ * If that's unset, use the tty termios setting.
++ */
++ if (state->info && state->info->tty && termios.c_cflag == 0)
++ termios = *state->info->tty->termios;
++
++ port->ops->set_termios(port, &termios, NULL);
+ console_start(port->cons);
+ }
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/040-sk_forward_alloc_underflow.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/040-sk_forward_alloc_underflow.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/040-sk_forward_alloc_underflow.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -0,0 +1,64 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [TCP]: Do not underflow sk_forward_alloc in sendpage().
+## 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
+# 2005/01/14 20:38:32-08:00 davem@nuts.davemloft.net
+# [TCP]: Do not underflow sk_forward_alloc in sendpage().
+#
+# We need to do the proper checks before we try to
+# pull space out of it, just like sendmsg() does.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# net/ipv4/tcp.c
+# 2005/01/14 20:37:59-08:00 davem@nuts.davemloft.net +12 -6
+# [TCP]: Do not underflow sk_forward_alloc in sendpage().
+#
+diff -Nru a/net/ipv4/tcp.c b/net/ipv4/tcp.c
+--- a/net/ipv4/tcp.c 2005-01-15 16:09:47 -08:00
++++ b/net/ipv4/tcp.c 2005-01-15 16:09:47 -08:00
+@@ -655,7 +655,7 @@
+ while (psize > 0) {
+ struct sk_buff *skb = sk->sk_write_queue.prev;
+ struct page *page = pages[poffset / PAGE_SIZE];
+- int copy, i;
++ int copy, i, can_coalesce;
+ int offset = poffset % PAGE_SIZE;
+ int size = min_t(size_t, psize, PAGE_SIZE - offset);
+
+@@ -677,14 +677,20 @@
+ copy = size;
+
+ i = skb_shinfo(skb)->nr_frags;
+- if (skb_can_coalesce(skb, i, page, offset)) {
++ can_coalesce = skb_can_coalesce(skb, i, page, offset);
++ if (!can_coalesce && i >= MAX_SKB_FRAGS) {
++ tcp_mark_push(tp, skb);
++ goto new_segment;
++ }
++ if (sk->sk_forward_alloc < copy &&
++ !sk_stream_mem_schedule(sk, copy, 0))
++ goto wait_for_memory;
++
++ if (can_coalesce) {
+ skb_shinfo(skb)->frags[i - 1].size += copy;
+- } else if (i < MAX_SKB_FRAGS) {
++ } else {
+ get_page(page);
+ skb_fill_page_desc(skb, i, page, offset, copy);
+- } else {
+- tcp_mark_push(tp, skb);
+- goto new_segment;
+ }
+
+ skb->len += copy;
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/041-ide_hwif_supress_busy.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/041-ide_hwif_supress_busy.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/041-ide_hwif_supress_busy.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -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: [ide] suppress output of error messages for non-existant interfaces
+## DP: Patch author: bzolnier@trik.(none)
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/15 02:31:51+01:00 bzolnier@trik.(none)
+# [ide] suppress output of error messages for non-existant interfaces
+#
+# From: Prarit Bhargava <prarit@sgi.com>
+#
+# Suppress output of "Wait for ready failed before probe !" messages for
+# non-existant interfaces.
+#
+# Please see
+# http://marc.theaimsgroup.com/?l=linux-ide&m=110553792013649&w=2 for
+# further context on this patch.
+#
+# Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
+#
+# drivers/ide/ide-probe.c
+# 2005/01/12 15:01:25+01:00 bzolnier@trik.(none) +1 -1
+# [ide] suppress output of error messages for non-existant interfaces
+#
+diff -Nru a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
+--- a/drivers/ide/ide-probe.c 2005-01-15 16:59:15 -08:00
++++ b/drivers/ide/ide-probe.c 2005-01-15 16:59:15 -08:00
+@@ -749,7 +749,7 @@
+ *
+ * BenH.
+ */
+- if (wait_hwif_ready(hwif))
++ if (wait_hwif_ready(hwif) == -EBUSY)
+ printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
+
+ /*
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/042-gx_get_cpuspeed_return_value.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/042-gx_get_cpuspeed_return_value.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/042-gx_get_cpuspeed_return_value.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -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: [CPUFREQ] gx-suspmod: fix gx_suspmod_get
+## DP: Patch author: davej@redhat.com
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/14 16:07:58-05:00 davej@redhat.com
+# [CPUFREQ] gx-suspmod: fix gx_suspmod_get
+#
+# Fix to return a proper cpu speed. it is caused by mistaking the meaning
+# of on and off.
+#
+# Signed-Off-by: Hiroshi Miura <miura@da-cha.org>
+# Signed-off-by: Dominik Brodowski <linux@brodo.de>
+# Signed-off-by: Dave Jones <davej@redhat.com>
+#
+# arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
+# 2005/01/14 16:07:49-05:00 davej@redhat.com +1 -1
+# [CPUFREQ] gx-suspmod: fix gx_suspmod_get
+#
+# Fix to return a proper cpu speed. it is caused by mistaking the meaning
+# of on and off.
+#
+# Signed-Off-by: Hiroshi Miura <miura@da-cha.org>
+# Signed-off-by: Dominik Brodowski <linux@brodo.de>
+# Signed-off-by: Dave Jones <davej@redhat.com>
+#
+diff -Nru a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
+--- a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c 2005-01-15 17:17:58 -08:00
++++ b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c 2005-01-15 17:17:58 -08:00
+@@ -209,7 +209,7 @@
+ if ((gx_params->pci_suscfg & SUSMOD) == 0)
+ return stock_freq;
+
+- return (stock_freq * gx_params->on_duration)
++ return (stock_freq * gx_params->off_duration)
+ / (gx_params->on_duration + gx_params->off_duration);
+ }
+
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/043-dothan_p4_get_frequency.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/043-dothan_p4_get_frequency.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/043-dothan_p4_get_frequency.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -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: [CPUFREQ] p4-clockmod: Dothan is 13 not 0x13
+## DP: Patch author: davej@redhat.com
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/14 16:05:45-05:00 davej@redhat.com
+# [CPUFREQ] p4-clockmod: Dothan is 13 not 0x13
+#
+# Dothan is stepping 13 == 0x0D instead of 0x13 == 19
+#
+# This bug crept bag in the shadows caused by the debug overhauling patch.
+#
+# Signed-off-by: Dominik Brodowski <linux@brodo.de>
+# Signed-off-by: Dave Jones <davej@redhat.com>
+#
+# arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
+# 2005/01/14 16:05:36-05:00 davej@redhat.com +1 -1
+# [CPUFREQ] p4-clockmod: Dothan is 13 not 0x13
+#
+# Dothan is stepping 13 == 0x0D instead of 0x13 == 19
+#
+# This bug crept bag in the shadows caused by the debug overhauling patch.
+#
+# Signed-off-by: Dominik Brodowski <linux@brodo.de>
+# Signed-off-by: Dave Jones <davej@redhat.com>
+#
+diff -Nru a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
+--- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2005-01-15 17:22:12 -08:00
++++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2005-01-15 17:22:12 -08:00
+@@ -171,7 +171,7 @@
+ return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
+ }
+
+- if ((c->x86 == 0x06) && (c->x86_model == 0x13)) {
++ if ((c->x86 == 0x06) && (c->x86_model == 0x0D)) {
+ /* Pentium M (Dothan) */
+ printk(KERN_WARNING PFX "Warning: Pentium M detected. "
+ "The speedstep_centrino module offers voltage scaling"
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/044-elevator_noop_add_request.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/044-elevator_noop_add_request.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/044-elevator_noop_add_request.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -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] noop-iosched: fix insertion point
+## DP: Patch author: axboe@suse.de
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/14 10:26:02-08:00 axboe@suse.de
+# [PATCH] noop-iosched: fix insertion point
+#
+# noop doesn't follow the instructions on where to insert a request,
+# because it uses q->queue_head instead of the *insert assigned. Clean it
+# up so it's easier to read.
+#
+# Signed-off-by: Jens Axboe <axboe@suse.de>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/block/noop-iosched.c
+# 2005/01/14 08:35:40-08:00 axboe@suse.de +3 -5
+# noop-iosched: fix insertion point
+#
+diff -Nru a/drivers/block/noop-iosched.c b/drivers/block/noop-iosched.c
+--- a/drivers/block/noop-iosched.c 2005-01-15 19:22:09 -08:00
++++ b/drivers/block/noop-iosched.c 2005-01-15 19:22:09 -08:00
+@@ -52,12 +52,10 @@
+ static void elevator_noop_add_request(request_queue_t *q, struct request *rq,
+ int where)
+ {
+- struct list_head *insert = q->queue_head.prev;
+-
+ if (where == ELEVATOR_INSERT_FRONT)
+- insert = &q->queue_head;
+-
+- list_add_tail(&rq->queuelist, &q->queue_head);
++ list_add(&rq->queuelist, &q->queue_head);
++ else
++ list_add_tail(&rq->queuelist, &q->queue_head);
+
+ /*
+ * new merges must not precede this barrier
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/045-pci_psycho_brainfart.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/045-pci_psycho_brainfart.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/045-pci_psycho_brainfart.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -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: [SPARC64]: Fix brainfart in pci_psycho.c
+## DP: Patch author: grundler@parisc-linux.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/13 21:19:16-08:00 grundler@parisc-linux.org
+# [SPARC64]: Fix brainfart in pci_psycho.c
+#
+# Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# arch/sparc64/kernel/pci_psycho.c
+# 2005/01/13 21:18:51-08:00 grundler@parisc-linux.org +3 -3
+# [SPARC64]: Fix brainfart in pci_psycho.c
+#
+# Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+diff -Nru a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
+--- a/arch/sparc64/kernel/pci_psycho.c 2005-01-15 19:42:49 -08:00
++++ b/arch/sparc64/kernel/pci_psycho.c 2005-01-15 19:42:49 -08:00
+@@ -453,9 +453,9 @@
+ tag_base = regbase + PSYCHO_STC_TAG_A;
+ line_base = regbase + PSYCHO_STC_LINE_A;
+ } else {
+- err_base = regbase + PSYCHO_STC_ERR_A;
+- tag_base = regbase + PSYCHO_STC_TAG_A;
+- line_base = regbase + PSYCHO_STC_LINE_A;
++ err_base = regbase + PSYCHO_STC_ERR_B;
++ tag_base = regbase + PSYCHO_STC_TAG_B;
++ line_base = regbase + PSYCHO_STC_LINE_B;
+ }
+
+ spin_lock(&stc_buf_lock);
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/046-ipv6_sit_lock.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/046-ipv6_sit_lock.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/046-ipv6_sit_lock.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -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: [IPV6]: Fix tunnel list locking in sit.c
+## DP: Patch author: yoshfuji@linux-ipv6.org
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/13 20:34:08-08:00 yoshfuji@linux-ipv6.org
+# [IPV6]: Fix tunnel list locking in sit.c
+#
+# Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# net/ipv6/sit.c
+# 2005/01/13 20:33:48-08:00 yoshfuji@linux-ipv6.org +2 -2
+# [IPV6]: Fix tunnel list locking in sit.c
+#
+# Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+diff -Nru a/net/ipv6/sit.c b/net/ipv6/sit.c
+--- a/net/ipv6/sit.c 2005-01-15 19:58:24 -08:00
++++ b/net/ipv6/sit.c 2005-01-15 19:58:24 -08:00
+@@ -135,10 +135,10 @@
+ {
+ struct ip_tunnel **tp = ipip6_bucket(t);
+
+- write_lock_bh(&ipip6_lock);
+ t->next = *tp;
+- write_unlock_bh(&ipip6_lock);
++ write_lock_bh(&ipip6_lock);
+ *tp = t;
++ write_unlock_bh(&ipip6_lock);
+ }
+
+ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int create)
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/047-do_tcp_sendpages_tso_assertion.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/047-do_tcp_sendpages_tso_assertion.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/047-do_tcp_sendpages_tso_assertion.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -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: [TCP]: Fix sk_forward_alloc assertion failures with TSO.
+## 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
+# 2005/01/13 20:02:46-08:00 davem@nuts.davemloft.net
+# [TCP]: Fix sk_forward_alloc assertion failures with TSO.
+#
+# do_tcp_sendpages() needs to do skb->truesize et al.
+# accounting just like tcp_sendmsg() does.
+#
+# tcp_sendmsg() works by gradually adjusting these
+# accounting knobs as user data is copied into the
+# packet.
+#
+# do_tcp_sendpages() works differently, when it allocates
+# a new SKB it optimistically adds in tp->mss_cache to
+# these values and then makes no adjustments at all as
+# pages are tacked onto the packet.
+#
+# This does not work at all if tcp_sendmsg() queues a
+# packet onto the send queue, and then do_tcp_sendpages()
+# attaches pages onto the end of that SKB. We are left
+# with a very inaccurate skb->truesize in that case.
+#
+# Consequently, if we were building a TSO frame and it
+# gets partially ACK'd, then since skb->truesize is too
+# small tcp_trim_skb() will potentially underflow it's
+# value and all the accounting becomes corrupted.
+#
+# This is usually seen as sk->sk_forward_alloc being
+# negative at socket destroy time, which triggers an
+# assertion check.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# net/ipv4/tcp.c
+# 2005/01/13 19:57:57-08:00 davem@nuts.davemloft.net +4 -1
+# [TCP]: Fix sk_forward_alloc assertion failures with TSO.
+#
+diff -Nru a/net/ipv4/tcp.c b/net/ipv4/tcp.c
+--- a/net/ipv4/tcp.c 2005-01-15 20:08:45 -08:00
++++ b/net/ipv4/tcp.c 2005-01-15 20:08:45 -08:00
+@@ -664,7 +664,7 @@
+ if (!sk_stream_memory_free(sk))
+ goto wait_for_sndbuf;
+
+- skb = sk_stream_alloc_pskb(sk, 0, tp->mss_cache,
++ skb = sk_stream_alloc_pskb(sk, 0, 0,
+ sk->sk_allocation);
+ if (!skb)
+ goto wait_for_memory;
+@@ -689,6 +689,9 @@
+
+ skb->len += copy;
+ skb->data_len += copy;
++ skb->truesize += copy;
++ sk->sk_wmem_queued += copy;
++ sk->sk_forward_alloc -= copy;
+ skb->ip_summed = CHECKSUM_HW;
+ tp->write_seq += copy;
+ TCP_SKB_CB(skb)->end_seq += copy;
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/048-matroxfb_mtrr_ifdef.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/048-matroxfb_mtrr_ifdef.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/048-matroxfb_mtrr_ifdef.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] matroxfb driver broken on non-x86.
+## DP: Patch author: davej@redhat.com
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/12 20:04:43-08:00 davej@redhat.com
+# [PATCH] matroxfb driver broken on non-x86.
+#
+# This broke since the recent MODULE_PARAM conversion on
+# architectures that don't have CONFIG_MTRR
+#
+# Signed-off-by: Dave Jones <davej@redhat.com>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/video/matrox/matroxfb_base.c
+# 2005/01/12 13:48:54-08:00 davej@redhat.com +2 -0
+# matroxfb driver broken on non-x86.
+#
+diff -Nru a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
+--- a/drivers/video/matrox/matroxfb_base.c 2005-01-15 20:26:33 -08:00
++++ b/drivers/video/matrox/matroxfb_base.c 2005-01-15 20:26:33 -08:00
+@@ -2477,8 +2477,10 @@
+ MODULE_PARM_DESC(noinit, "Disables W/SG/SD-RAM and bus interface initialization (0 or 1=do not initialize) (default=0)");
+ MODULE_PARM(memtype, "i");
+ MODULE_PARM_DESC(memtype, "Memory type for G200/G400 (see Documentation/fb/matroxfb.txt for explanation) (default=3 for G200, 0 for G400)");
++#ifdef CONFIG_MTRR
+ MODULE_PARM(mtrr, "i");
+ MODULE_PARM_DESC(mtrr, "This speeds up video memory accesses (0=disabled or 1) (default=1)");
++#endif
+ MODULE_PARM(sgram, "i");
+ MODULE_PARM_DESC(sgram, "Indicates that G100/G200/G400 has SGRAM memory (0=SDRAM, 1=SGRAM) (default=0)");
+ MODULE_PARM(inv24, "i");
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/050-cfq_requeue_request_accounting.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/050-cfq_requeue_request_accounting.dpatch 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/050-cfq_requeue_request_accounting.dpatch 2005-01-18 07:29:39 UTC (rev 2316)
@@ -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] cfq-iosched: fix scsi requeue accounting
+## DP: Patch author: axboe@suse.de
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/01/12 08:49:02-08:00 axboe@suse.de
+# [PATCH] cfq-iosched: fix scsi requeue accounting
+#
+# The accounting can go bad in the requeue hook, it must check the
+# accounted flag to make sure it was previously considered in the driver.
+#
+# Signed-off-by: Jens Axboe <axboe@suse.de>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/block/cfq-iosched.c
+# 2005/01/11 01:03:17-08:00 axboe@suse.de +4 -2
+# cfq-iosched: fix scsi requeue accounting
+#
+diff -Nru a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
+--- a/drivers/block/cfq-iosched.c 2005-01-15 20:41:34 -08:00
++++ b/drivers/block/cfq-iosched.c 2005-01-15 20:41:34 -08:00
+@@ -622,8 +622,10 @@
+ cfq_sort_rr_list(cfqq, 0);
+ }
+
+- crq->accounted = 0;
+- cfqq->cfqd->rq_in_driver--;
++ if (crq->accounted) {
++ crq->accounted = 0;
++ cfqq->cfqd->rq_in_driver--;
++ }
+ }
+ list_add(&rq->queuelist, &q->queue_head);
+ }
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4 2005-01-18 04:59:18 UTC (rev 2315)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4 2005-01-18 07:29:39 UTC (rev 2316)
@@ -17,3 +17,17 @@
+ 034-stack_resize_exploit.dpatch
+ 035-do_brk_security_fixes-2.dpatch
+ cmsg-compat-signedness-fix-fix.dpatch
++ 036-rlimit_memlock_check-2.dpatch
++ 037-sctp_err_lookup_oops.dpatch
++ 038-ftdi_sio_debug_output.dpatch
++ 039-serial_console_resume.dpatch
++ 040-sk_forward_alloc_underflow.dpatch
++ 041-ide_hwif_supress_busy.dpatch
++ 042-gx_get_cpuspeed_return_value.dpatch
++ 043-dothan_p4_get_frequency.dpatch
++ 044-elevator_noop_add_request.dpatch
++ 045-pci_psycho_brainfart.dpatch
++ 046-ipv6_sit_lock.dpatch
++ 047-do_tcp_sendpages_tso_assertion.dpatch
++ 048-matroxfb_mtrr_ifdef.dpatch
++ 050-cfq_requeue_request_accounting.dpatch