r2450 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series

[maximilian attems]

Author: maks-guest
Date: 2005-02-07 11:15:43 +0100 (Mon, 07 Feb 2005)
New Revision: 2450

Removed:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/char-tty-typo.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:
revert bogus typo patch


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 09:56:14 UTC (rev 2449)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-02-07 10:15:43 UTC (rev 2450)
@@ -14,8 +14,6 @@
   * amd64-ia32-vsyscall-fix.dpatch
     fix crash in 32bit emulation. Backport from 2.6.11-rc2 (Frederik Schüler)
 
-  * Fix bug in tty_io due typo. (Maximilian Attems)
-
   * [powerpc] - powerpc-fix-power3-ftbfs.dpatch
     Fix a FTBFS with the simple bootloaders on power3/4.
 

Deleted: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/char-tty-typo.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/char-tty-typo.dpatch	2005-02-07 09:56:14 UTC (rev 2449)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/char-tty-typo.dpatch	2005-02-07 10:15:43 UTC (rev 2450)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: typo in tty_io.c
-## DP: Patch author: viro
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2005/02/02 08:48:23-08:00 pavenis@latnet.lv 
-#   [PATCH] Bug in tty_io.c after changes between 2.6.9-rc1-bk1 and 2.6.9-rc1-bk2
-#   
-#   Fix http://bugzilla.kernel.org/show_bug.cgi?id=3736
-#   
-#   Finally located that a problem seems to be a simple typo.
-#   
-#   Acked-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
-#   Signed-off-by: Andrew Morton <akpm@osdl.org>
-#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-# 
-# drivers/char/tty_io.c
-#   2005/01/30 22:33:45-08:00 pavenis@latnet.lv +2 -2
-#   Bug in tty_io.c after changes between 2.6.9-rc1-bk1 and 2.6.9-rc1-bk2
-# 
-diff -Nru a/drivers/char/tty_io.c b/drivers/char/tty_io.c
---- a/drivers/char/tty_io.c	2005-02-03 09:45:20 -08:00
-+++ b/drivers/char/tty_io.c	2005-02-03 09:45:20 -08:00
-@@ -1148,8 +1148,8 @@
- 	int i = index + driver->name_base;
- 	/* ->name is initialized to "ttyp", but "tty" is expected */
- 	sprintf(p, "%s%c%x",
--			driver->subtype == PTY_TYPE_SLAVE ? "tty" : driver->name,
--			ptychar[i >> 4 & 0xf], i & 0xf);
-+		driver->subtype == PTY_TYPE_SLAVE ? "pty" : driver->name,
-+		ptychar[i >> 4 & 0xf], i & 0xf);
- }
- 
- static inline void tty_line_name(struct tty_driver *driver, int index, char *p)

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 09:56:14 UTC (rev 2449)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5	2005-02-07 10:15:43 UTC (rev 2450)
@@ -2,5 +2,4 @@
 + ia64-ptrace-fixes.dpatch
 + ia64-unwind-fix.dpatch
 + amd64-ia32-vsyscall-fix.dpatch
-+ char-tty-typo.dpatch
 + powerpc-fix-power3-ftbfs.dpatch