r2456 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series
Andres Salomon
dilinger-guest@costa.debian.org
Mon, 07 Feb 2005 21:33:24 +0100
Author: dilinger-guest
Date: 2005-02-07 21:33:23 +0100 (Mon, 07 Feb 2005)
New Revision: 2456
Removed:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/057-scsi_ioctl_unknown_opcode.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/059-ia64_unwind_stack_check.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-5
Log:
drop already added patches
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-02-07 20:27:20 UTC (rev 2455)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-02-07 20:33:23 UTC (rev 2456)
@@ -53,19 +53,10 @@
longer take an argument. This patch removes the test checking the
(non-existent) arg. (Andres Salomon)
- * 057-scsi_ioctl_unknown_opcode.dpatch
- scsi_ioctl's verify_command() had a check added to print debugging info
- about unknown scsi opcodes; however, the check was incorrect. This
- fixes it. (Andres Salomon)
-
* [IA64] 058-ia64_binfmt_elf_bug_out.dpatch
Returning early from ia64_elf32_init in the case of failures
could be problematic. Instead of doing that, call BUG(). (Andres Salomon)
- * [IA64] 059-ia64_unwind_stack_check.dpatch
- Add a an additional sanity check to ia64's unw_unwind_to_user().
- (Andres Salomon)
-
* [ALSA] 060-alsa_cs4231_lib_ifdef_typo.dpatch
cs4231_lib.c has an #ifdef typo; s/SNDRV_DEBUGq_MCE/SNDRV_DEBUG_MCE/.
(Andres Salomon)
Deleted: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/057-scsi_ioctl_unknown_opcode.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/057-scsi_ioctl_unknown_opcode.dpatch 2005-02-07 20:27:20 UTC (rev 2455)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/057-scsi_ioctl_unknown_opcode.dpatch 2005-02-07 20:33:23 UTC (rev 2456)
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: scsi_ioctl: only warn about unknown opcodes if they are truly unknown.
-## DP: Patch author: torvalds@ppc970.osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/20 07:42:05-08:00 torvalds@ppc970.osdl.org
-# scsi_ioctl: only warn about unknown opcodes if they are truly unknown.
-#
-# We could screw up and warn for opcodes that weren't write-safe and the
-# user tried to use without having write permissions.
-#
-# Not so bad in itself, but that also destroyed the cmd type information.
-#
-# Noticed by Michal Schmidt
-#
-# drivers/block/scsi_ioctl.c
-# 2005/01/20 07:41:57-08:00 torvalds@ppc970.osdl.org +1 -1
-# scsi_ioctl: only warn about unknown opcodes if they are truly unknown.
-#
-# We could screw up and warn for opcodes that weren't write-safe and the
-# user tried to use without having write permissions.
-#
-# Not so bad in itself, but that also destroyed the cmd type information.
-#
-# Noticed by Michal Schmidt
-#
-diff -Nru a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
---- a/drivers/block/scsi_ioctl.c 2005-01-22 21:20:05 -08:00
-+++ b/drivers/block/scsi_ioctl.c 2005-01-22 21:20:05 -08:00
-@@ -199,7 +199,7 @@
- return 0;
- }
-
-- if (!(type & CMD_WARNED)) {
-+ if (!type) {
- cmd_type[cmd[0]] = CMD_WARNED;
- printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]);
- }
Deleted: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/059-ia64_unwind_stack_check.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/059-ia64_unwind_stack_check.dpatch 2005-02-07 20:27:20 UTC (rev 2455)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/059-ia64_unwind_stack_check.dpatch 2005-02-07 20:33:23 UTC (rev 2456)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [IA64] Sanity check unw_unwind_to_user
-## DP: Patch author: kaos@sgi.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/22 12:59:23-08:00 kaos@sgi.com
-# [IA64] Sanity check unw_unwind_to_user
-#
-# Signed-off-by: Keith Owens <kaos@sgi.com>
-# Signed-off-by: Tony Luck <tony.luck@intel.com>
-#
-# arch/ia64/kernel/unwind.c
-# 2005/01/22 12:57:36-08:00 kaos@sgi.com +4 -1
-# Sanity check unw_unwind_to_user
-#
-diff -Nru a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c
---- a/arch/ia64/kernel/unwind.c 2005-01-22 23:36:12 -08:00
-+++ b/arch/ia64/kernel/unwind.c 2005-01-22 23:36:12 -08:00
-@@ -1945,7 +1945,7 @@
- int
- unw_unwind_to_user (struct unw_frame_info *info)
- {
-- unsigned long ip;
-+ unsigned long ip, sp;
-
- while (unw_unwind(info) >= 0) {
- if (unw_get_rp(info, &ip) < 0) {
-@@ -1954,6 +1954,9 @@
- __FUNCTION__, ip);
- return -1;
- }
-+ unw_get_sp(info, &sp);
-+ if (sp >= (unsigned long)info->task + IA64_STK_OFFSET)
-+ break;
- if (ip < FIXADDR_USER_END)
- return 0;
- }
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5 2005-02-07 20:27:20 UTC (rev 2455)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5 2005-02-07 20:33:23 UTC (rev 2456)
@@ -12,9 +12,7 @@
+ 054-ext3_journal_abort_before_panic.dpatch
+ 055-uml_new_thread_race.dpatch
+ 056-x86_64_acpi_do_suspend_lowlevel_arg.dpatch
-+ 057-scsi_ioctl_unknown_opcode.dpatch
+ 058-ia64_binfmt_elf_bug_out.dpatch
-+ 059-ia64_unwind_stack_check.dpatch
+ 060-alsa_cs4231_lib_ifdef_typo.dpatch
+ 061-alsa_es18xx_ifdef_typo.dpatch
+ 062-alsa_sscape_user_copy_check.dpatch