r2602 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches: . series
Sven Luther
luther@costa.debian.org
Fri, 04 Mar 2005 18:41:02 +0100
Author: luther
Date: 2005-03-04 18:41:01 +0100 (Fri, 04 Mar 2005)
New Revision: 2602
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fs-asfs.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
Adapted fs-asfs dpatch.
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fs-asfs.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fs-asfs.dpatch 2005-03-04 17:33:54 UTC (rev 2601)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fs-asfs.dpatch 2005-03-04 17:41:01 UTC (rev 2602)
@@ -4,15 +4,15 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Description: add support for the Amiga SmartFilesystem (asfs), 1.0beta7
## DP: Patch author: Marek Szyprowski <marek@amiga.pl>
-## DP: Upstream status: not submitted
+## DP: Upstream status: submitted but no reply
## DP: Reference: http://home.elka.pw.edu.pl/~mszyprow/programy/asfs/
. $(dirname $0)/DPATCH
@DPATCH@
-diff -urN linux-2.6.3/Documentation/filesystems/00-INDEX linux-2.6.3-asfs-1.0b7/Documentation/filesystems/00-INDEX
---- linux-2.6.3/Documentation/filesystems/00-INDEX 2004-03-22 17:34:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/Documentation/filesystems/00-INDEX 2004-03-22 17:34:00.000000000 +0100
+diff -urN kernel-source-2.6.11-2.6.11-orig/Documentation/filesystems/00-INDEX kernel-source-2.6.11-2.6.11/Documentation/filesystems/00-INDEX
+--- kernel-source-2.6.11-2.6.11-orig/Documentation/filesystems/00-INDEX 2005-03-02 08:38:33.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/Documentation/filesystems/00-INDEX 2005-03-04 18:37:12.317334816 +0100
@@ -6,6 +6,8 @@
- info and mount options for the Acorn Advanced Disc Filing System.
affs.txt
@@ -22,9 +22,9 @@
bfs.txt
- info for the SCO UnixWare Boot Filesystem (BFS).
cifs.txt
-diff -urN linux-2.6.3/Documentation/filesystems/asfs.txt linux-2.6.3-asfs-1.0b7/Documentation/filesystems/asfs.txt
---- linux-2.6.3/Documentation/filesystems/asfs.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/Documentation/filesystems/asfs.txt 2004-06-17 00:47:17.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/Documentation/filesystems/asfs.txt kernel-source-2.6.11-2.6.11/Documentation/filesystems/asfs.txt
+--- kernel-source-2.6.11-2.6.11-orig/Documentation/filesystems/asfs.txt 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/Documentation/filesystems/asfs.txt 2005-03-04 18:37:12.382324936 +0100
@@ -0,0 +1,150 @@
+
+Amiga SmartFileSystem, Linux implementation
@@ -176,9 +176,9 @@
+The ASFS driver is realased under the terms of of the GNU General
+Public License. See source code for more details.
+
-diff -urN linux-2.6.3/fs/asfs/adminspace.c linux-2.6.3-asfs-1.0b7/fs/asfs/adminspace.c
---- linux-2.6.3/fs/asfs/adminspace.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/adminspace.c 2004-06-13 21:03:49.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/adminspace.c kernel-source-2.6.11-2.6.11/fs/asfs/adminspace.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/adminspace.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/adminspace.c 2005-03-04 18:37:12.447315056 +0100
@@ -0,0 +1,446 @@
+/*
+ *
@@ -626,9 +626,9 @@
+}
+
+#endif
-diff -urN linux-2.6.3/fs/asfs/asfs_fs.h linux-2.6.3-asfs-1.0b7/fs/asfs/asfs_fs.h
---- linux-2.6.3/fs/asfs/asfs_fs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/asfs_fs.h 2004-06-10 19:28:16.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/asfs_fs.h kernel-source-2.6.11-2.6.11/fs/asfs/asfs_fs.h
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/asfs_fs.h 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/asfs_fs.h 2005-03-04 18:37:12.512305176 +0100
@@ -0,0 +1,227 @@
+#ifndef __LINUX_ASFS_FS_H
+#define __LINUX_ASFS_FS_H
@@ -857,9 +857,9 @@
+int asfs_write_symlink(struct inode *symfile, const char *symname);
+
+#endif
-diff -urN linux-2.6.3/fs/asfs/bitfuncs.c linux-2.6.3-asfs-1.0b7/fs/asfs/bitfuncs.c
---- linux-2.6.3/fs/asfs/bitfuncs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/bitfuncs.c 2004-06-14 17:38:04.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/bitfuncs.c kernel-source-2.6.11-2.6.11/fs/asfs/bitfuncs.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/bitfuncs.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/bitfuncs.c 2005-03-04 18:37:12.514304872 +0100
@@ -0,0 +1,171 @@
+/*
+ *
@@ -1032,9 +1032,9 @@
+ }
+ return (orgbits - bits);
+}
-diff -urN linux-2.6.3/fs/asfs/bitfuncs.h linux-2.6.3-asfs-1.0b7/fs/asfs/bitfuncs.h
---- linux-2.6.3/fs/asfs/bitfuncs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/bitfuncs.h 2004-06-10 18:57:14.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/bitfuncs.h kernel-source-2.6.11-2.6.11/fs/asfs/bitfuncs.h
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/bitfuncs.h 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/bitfuncs.h 2005-03-04 18:37:12.582294536 +0100
@@ -0,0 +1,58 @@
+/*
+ *
@@ -1094,9 +1094,9 @@
+int bmset(u32 *, int, int, int);
+
+#endif
-diff -urN linux-2.6.3/fs/asfs/Changes linux-2.6.3-asfs-1.0b7/fs/asfs/Changes
---- linux-2.6.3/fs/asfs/Changes 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/Changes 2004-06-25 22:44:01.646070896 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/Changes kernel-source-2.6.11-2.6.11/fs/asfs/Changes
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/Changes 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/Changes 2005-03-04 18:37:12.584294232 +0100
@@ -0,0 +1,101 @@
+
+Amiga Smart File System, Linux implementation
@@ -1199,9 +1199,9 @@
+v0.1beta (11.06.2003)
+- after many kernel crashes, finally got it!
+- first working read-only filesystem driver
-diff -urN linux-2.6.3/fs/asfs/dir.c linux-2.6.3-asfs-1.0b7/fs/asfs/dir.c
---- linux-2.6.3/fs/asfs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/dir.c 2004-06-17 00:44:35.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/dir.c kernel-source-2.6.11-2.6.11/fs/asfs/dir.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/dir.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/dir.c 2005-03-04 18:37:12.647284656 +0100
@@ -0,0 +1,217 @@
+/*
+ *
@@ -1420,9 +1420,9 @@
+ d_add(dentry, inode);
+ return ERR_PTR(res);
+}
-diff -urN linux-2.6.3/fs/asfs/extents.c linux-2.6.3-asfs-1.0b7/fs/asfs/extents.c
---- linux-2.6.3/fs/asfs/extents.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/extents.c 2004-06-10 17:56:26.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/extents.c kernel-source-2.6.11-2.6.11/fs/asfs/extents.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/extents.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/extents.c 2005-03-04 18:37:12.713274624 +0100
@@ -0,0 +1,586 @@
+/*
+ *
@@ -2010,9 +2010,9 @@
+ return errorcode;
+}
+#endif
-diff -urN linux-2.6.3/fs/asfs/file.c linux-2.6.3-asfs-1.0b7/fs/asfs/file.c
---- linux-2.6.3/fs/asfs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/file.c 2004-06-10 01:42:01.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/file.c kernel-source-2.6.11-2.6.11/fs/asfs/file.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/file.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/file.c 2005-03-04 18:37:12.715274320 +0100
@@ -0,0 +1,251 @@
+/*
+ *
@@ -2265,9 +2265,9 @@
+}
+
+#endif
-diff -urN linux-2.6.3/fs/asfs/inode.c linux-2.6.3-asfs-1.0b7/fs/asfs/inode.c
---- linux-2.6.3/fs/asfs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/inode.c 2004-06-17 00:39:10.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/inode.c kernel-source-2.6.11-2.6.11/fs/asfs/inode.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/inode.c 2005-03-04 18:37:12.778264744 +0100
@@ -0,0 +1,414 @@
+/*
+ *
@@ -2683,9 +2683,9 @@
+}
+*/
+#endif
-diff -urN linux-2.6.3/fs/asfs/Makefile linux-2.6.3-asfs-1.0b7/fs/asfs/Makefile
---- linux-2.6.3/fs/asfs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/Makefile 2004-06-09 21:23:40.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/Makefile kernel-source-2.6.11-2.6.11/fs/asfs/Makefile
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/Makefile 2005-03-04 18:37:12.779264592 +0100
@@ -0,0 +1,8 @@
+#
+# Makefile for the linux asfs filesystem routines.
@@ -2695,9 +2695,9 @@
+
+asfs-y += dir.o extents.o file.o inode.o namei.o nodes.o objects.o super.o symlink.o
+asfs-$(CONFIG_ASFS_RW) += adminspace.o bitfuncs.o
-diff -urN linux-2.6.3/fs/asfs/namei.c linux-2.6.3-asfs-1.0b7/fs/asfs/namei.c
---- linux-2.6.3/fs/asfs/namei.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/namei.c 2004-06-10 01:41:51.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/namei.c kernel-source-2.6.11-2.6.11/fs/asfs/namei.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/namei.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/namei.c 2005-03-04 18:37:12.780264440 +0100
@@ -0,0 +1,155 @@
+/*
+ *
@@ -2854,9 +2854,9 @@
+ return hashval;
+}
+
-diff -urN linux-2.6.3/fs/asfs/nodes.c linux-2.6.3-asfs-1.0b7/fs/asfs/nodes.c
---- linux-2.6.3/fs/asfs/nodes.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/nodes.c 2004-06-10 01:41:46.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/nodes.c kernel-source-2.6.11-2.6.11/fs/asfs/nodes.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/nodes.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/nodes.c 2005-03-04 18:37:12.833256384 +0100
@@ -0,0 +1,455 @@
+/*
+ *
@@ -3313,9 +3313,9 @@
+}
+
+#endif
-diff -urN linux-2.6.3/fs/asfs/objects.c linux-2.6.3-asfs-1.0b7/fs/asfs/objects.c
---- linux-2.6.3/fs/asfs/objects.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/objects.c 2004-06-10 17:16:10.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/objects.c kernel-source-2.6.11-2.6.11/fs/asfs/objects.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/objects.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/objects.c 2005-03-04 18:37:12.891247568 +0100
@@ -0,0 +1,765 @@
+/*
+ *
@@ -4082,9 +4082,9 @@
+ return 0;
+}
+#endif
-diff -urN linux-2.6.3/fs/asfs/super.c linux-2.6.3-asfs-1.0b7/fs/asfs/super.c
---- linux-2.6.3/fs/asfs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/super.c 2004-06-25 22:44:25.119502392 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/super.c kernel-source-2.6.11-2.6.11/fs/asfs/super.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/super.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/super.c 2005-03-04 18:37:12.946239208 +0100
@@ -0,0 +1,437 @@
+/*
+ *
@@ -4523,9 +4523,9 @@
+
+module_init(init_asfs_fs)
+module_exit(exit_asfs_fs)
-diff -urN linux-2.6.3/fs/asfs/symlink.c linux-2.6.3-asfs-1.0b7/fs/asfs/symlink.c
---- linux-2.6.3/fs/asfs/symlink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/asfs/symlink.c 2004-06-10 01:41:24.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/asfs/symlink.c kernel-source-2.6.11-2.6.11/fs/asfs/symlink.c
+--- kernel-source-2.6.11-2.6.11-orig/fs/asfs/symlink.c 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/asfs/symlink.c 2005-03-04 18:37:12.947239056 +0100
@@ -0,0 +1,165 @@
+/*
+ *
@@ -4692,10 +4692,10 @@
+}
+
+#endif
-diff -urN linux-2.6.3/fs/Kconfig linux-2.6.3-asfs-1.0b7/fs/Kconfig
---- linux-2.6.3/fs/Kconfig 2004-03-22 17:34:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/Kconfig 2004-06-17 00:31:43.000000000 +0200
-@@ -963,6 +963,37 @@
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/Kconfig kernel-source-2.6.11-2.6.11/fs/Kconfig
+--- kernel-source-2.6.11-2.6.11-orig/fs/Kconfig 2005-03-02 08:38:10.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/Kconfig 2005-03-04 18:37:13.115213520 +0100
+@@ -921,6 +921,37 @@
To compile this file system support as a module, choose M here: the
module will be called affs. If unsure, say N.
@@ -4733,10 +4733,10 @@
config HFS_FS
tristate "Apple Macintosh file system support (EXPERIMENTAL)"
depends on EXPERIMENTAL
-diff -urN linux-2.6.3/fs/Makefile linux-2.6.3-asfs-1.0b7/fs/Makefile
---- linux-2.6.3/fs/Makefile 2004-03-22 17:34:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/fs/Makefile 2004-03-22 18:22:00.000000000 +0100
-@@ -80,6 +80,7 @@
+diff -urN kernel-source-2.6.11-2.6.11-orig/fs/Makefile kernel-source-2.6.11-2.6.11/fs/Makefile
+--- kernel-source-2.6.11-2.6.11-orig/fs/Makefile 2005-03-02 08:38:10.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/Makefile 2005-03-04 18:37:13.116213368 +0100
+@@ -81,6 +81,7 @@
obj-$(CONFIG_JFFS_FS) += jffs/
obj-$(CONFIG_JFFS2_FS) += jffs2/
obj-$(CONFIG_AFFS_FS) += affs/
@@ -4744,9 +4744,9 @@
obj-$(CONFIG_ROMFS_FS) += romfs/
obj-$(CONFIG_QNX4FS_FS) += qnx4/
obj-$(CONFIG_AUTOFS_FS) += autofs/
-diff -urN linux-2.6.3/include/linux/amigasfs.h linux-2.6.3-asfs-1.0b7/include/linux/amigasfs.h
---- linux-2.6.3/include/linux/amigasfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.3-asfs-1.0b7/include/linux/amigasfs.h 2004-06-10 19:24:37.000000000 +0200
+diff -urN kernel-source-2.6.11-2.6.11-orig/include/linux/amigasfs.h kernel-source-2.6.11-2.6.11/include/linux/amigasfs.h
+--- kernel-source-2.6.11-2.6.11-orig/include/linux/amigasfs.h 1970-01-01 01:00:00.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/include/linux/amigasfs.h 2005-03-04 18:37:13.169205312 +0100
@@ -0,0 +1,276 @@
+#ifndef __LINUX_AMIGASFS_H
+#define __LINUX_AMIGASFS_H
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-04 17:33:54 UTC (rev 2601)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-04 17:41:01 UTC (rev 2602)
@@ -27,12 +27,11 @@
+ powerpc-fix-power3-ftbfs.dpatch
+ powerpc-serial.dpatch
+ powerpc-g4-l2-flush-errata.dpatch
++ fs-asfs.dpatch
-# + fs-asfs.dpatch
# + modular-ide-pnp.dpatch
# + modular-ide.dpatch
# + modular-vesafb.dpatch
-
# + drivers-ide-dma-blacklist-toshiba.dpatch
# + drivers-net-8139too-locking.dpatch
# + drivers-net-tg3-readd.dpatch