r1920 - in trunk/kernel/s390/2.6.8: debian diffs

Bastian Blank waldi@haydn.debian.org
Thu, 25 Nov 2004 07:06:36 -0700


Author: waldi
Date: 2004-11-25 07:06:06 -0700 (Thu, 25 Nov 2004)
New Revision: 1920

Removed:
   trunk/kernel/s390/2.6.8/diffs/copy_in_user.diff
Modified:
   trunk/kernel/s390/2.6.8/debian/changelog
   trunk/kernel/s390/2.6.8/debian/control
   trunk/kernel/s390/2.6.8/debian/rules
Log:
Use kernel-tree-2.6.8-10.


Modified: trunk/kernel/s390/2.6.8/debian/changelog
===================================================================
--- trunk/kernel/s390/2.6.8/debian/changelog	2004-11-25 09:54:41 UTC (rev 1919)
+++ trunk/kernel/s390/2.6.8/debian/changelog	2004-11-25 14:06:06 UTC (rev 1920)
@@ -2,8 +2,9 @@
 
   * debian/rules
     - Ask patch to suppress backup.
+  * Use kernel-tree-2.6.8-10.
 
- -- Bastian Blank <waldi@debian.org>  Wed, 15 Sep 2004 16:41:31 +0200
+ -- Bastian Blank <waldi@debian.org>  Wed, 24 Nov 2004 21:22:42 +0100
 
 kernel-image-2.6.8-s390 (2.6.8-2) unstable; urgency=medium
 

Modified: trunk/kernel/s390/2.6.8/debian/control
===================================================================
--- trunk/kernel/s390/2.6.8/debian/control	2004-11-25 09:54:41 UTC (rev 1919)
+++ trunk/kernel/s390/2.6.8/debian/control	2004-11-25 14:06:06 UTC (rev 1920)
@@ -4,7 +4,7 @@
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Jochen Röhrig <jr@debian.org>
 Standards-Version: 3.5.6
-Build-Depends: debhelper (>> 4.0.0), module-init-tools, kernel-tree-2.6.8-6, kernel-package (>= 8.084)
+Build-Depends: debhelper (>> 4.0.0), module-init-tools, kernel-tree-2.6.8-10, kernel-package (>= 8.084)
 
 Package: kernel-patch-2.6.8-s390
 Architecture: all

Modified: trunk/kernel/s390/2.6.8/debian/rules
===================================================================
--- trunk/kernel/s390/2.6.8/debian/rules	2004-11-25 09:54:41 UTC (rev 1919)
+++ trunk/kernel/s390/2.6.8/debian/rules	2004-11-25 14:06:06 UTC (rev 1920)
@@ -48,7 +48,7 @@
 tree-stamp: patch-stamp
 
 	@-rm -rf build
-	cp -al patch build
+	cp -al patch/kernel-source-$(version) build
 	mkdir build/debian
 	cp debian/changelog debian/control debian/copyright build/debian
 	echo "official" > build/debian/official

Deleted: trunk/kernel/s390/2.6.8/diffs/copy_in_user.diff
===================================================================
--- trunk/kernel/s390/2.6.8/diffs/copy_in_user.diff	2004-11-25 09:54:41 UTC (rev 1919)
+++ trunk/kernel/s390/2.6.8/diffs/copy_in_user.diff	2004-11-25 14:06:06 UTC (rev 1920)
@@ -1,10 +0,0 @@
---- arch/s390/kernel/s390_ksyms.c	2004-08-14 05:37:15.000000000 +0000
-+++ arch/s390/kernel/s390_ksyms.c	2004-09-01 16:21:14.000000000 +0000
-@@ -29,6 +29,7 @@
- EXPORT_SYMBOL_NOVERS(_sb_findmap);
- EXPORT_SYMBOL_NOVERS(__copy_from_user_asm);
- EXPORT_SYMBOL_NOVERS(__copy_to_user_asm);
-+EXPORT_SYMBOL_NOVERS(__copy_in_user_asm);
- EXPORT_SYMBOL_NOVERS(__clear_user_asm);
- EXPORT_SYMBOL_NOVERS(__strncpy_from_user_asm);
- EXPORT_SYMBOL_NOVERS(__strnlen_user_asm);