r1091 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches

[Christoph Hellwig]

Author: hch-guest
Date: 2004-08-14 05:15:42 -0600 (Sat, 14 Aug 2004)
New Revision: 1091

Removed:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-cramfs-constify.dpatch
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/include-thread_info-ifdefs.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-1
Log:

 * Drop two unneeded patches:
   . fs-cramfs-constify
   . include-thread_info-ifdefs



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-14 11:11:57 UTC (rev 1090)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-14 11:15:42 UTC (rev 1091)
@@ -44,6 +44,10 @@
 
   * Fix typo in alpha-termbits patch naming (Christoph Hellwig)
 
+  * Drop two unneeded patches (Christoph Hellwig):
+    . fs-cramfs-constify
+    . include-thread_info-ifdefs
+
  -- Andres Salomon <dilinger@voxel.net>  Sat, 14 Aug 2004 02:40:50 -0400
 
 kernel-source-2.6.7 (2.6.7-4) unstable; urgency=high

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-1	2004-08-14 11:11:57 UTC (rev 1090)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-1	2004-08-14 11:15:42 UTC (rev 1091)
@@ -11,9 +11,7 @@
 drivers-scsi-generic_proc_info
 extraversion
 fs-asfs-2
-fs-cramfs-constify
 include-missing-includes
-include-thread_info-ifdefs
 ipsec-missing_wakeup
 modular-ide
 modular-ide-pnp

Deleted: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-cramfs-constify.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-cramfs-constify.dpatch	2004-08-14 11:11:57 UTC (rev 1090)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-cramfs-constify.dpatch	2004-08-14 11:15:42 UTC (rev 1091)
@@ -1,22 +0,0 @@
-#! /bin/sh -e 
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: make zerotime const in fs/cramfs/inode.c
-## DP: Patch author: unknown
-## DP: Upstream status: rejected
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
---- kernel-source-2.6.6/fs/cramfs/inode.c	2004-05-10 19:48:02.000000000 +1000
-+++ kernel-source-2.6.6-1/fs/cramfs/inode.c	2004-05-10 22:21:47.000000000 +1000
-@@ -42,7 +42,7 @@
- static struct inode *get_cramfs_inode(struct super_block *sb, struct cramfs_inode * cramfs_inode)
- {
- 	struct inode * inode = new_inode(sb);
--	static struct timespec zerotime;
-+	const struct timespec zerotime = { 0, 0 };
- 
- 	if (inode) {
- 		inode->i_mode = cramfs_inode->mode;

Deleted: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/include-thread_info-ifdefs.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/include-thread_info-ifdefs.dpatch	2004-08-14 11:11:57 UTC (rev 1090)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/include-thread_info-ifdefs.dpatch	2004-08-14 11:15:42 UTC (rev 1091)
@@ -1,30 +0,0 @@
-#! /bin/sh -e 
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: check __HAVE_THREAD_FUNCTIONS in include/linux/thread_info.h (m68k)
-## DP: Patch author: unknown
-## DP: Upstream status: not submitted
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
---- kernel-source-2.6.6/include/linux/thread_info.h	2004-03-11 13:55:54.000000000 +1100
-+++ kernel-source-2.6.6-1/include/linux/thread_info.h	2004-04-03 15:06:43.000000000 +1000
-@@ -21,6 +21,7 @@
- #include <asm/thread_info.h>
- 
- #ifdef __KERNEL__
-+#ifndef __HAVE_THREAD_FUNCTIONS
- 
- /*
-  * flag set/clear/test wrappers
-@@ -87,6 +88,7 @@
- 	clear_thread_flag(TIF_NEED_RESCHED);
- }
- 
--#endif
-+#endif	/* __HAVE_THREAD_FUNCTIONS */
-+#endif	/* __KERNEL__ */
- 
- #endif /* _LINUX_THREAD_INFO_H */