[kernel] r6951 - in dists/trunk/linux-2.6/debian: . patches/series

[Sven Luther]

Author: luther
Date: Wed Jul  5 21:39:23 2006
New Revision: 6951

Added:
   dists/trunk/linux-2.6/debian/patches/fs-asfs.patch
      - copied, changed from r6949, /dists/trunk/linux-2.6/debian/patches/fs-asfs-2.patch
Removed:
   dists/trunk/linux-2.6/debian/patches/fs-asfs-2.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/3

Log:
Fixed trivial mis-applying asfs hunk, and readded it.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jul  5 21:39:23 2006
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.17-3) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * Add stable release 2.6.17.2:
     - ide-io: increase timeout value to allow for slave wakeup
     - NTFS: Critical bug fix (affects MIPS and possibly others)
@@ -33,7 +34,10 @@
     reference, the asfs patch is in the Debian kernel. Remove reference to
     AMD 768 erratum 10, it was solved in 2.6.12. Add wording corrections.
 
- -- maximilian attems <maks at sternwelten.at>  Tue,  4 Jul 2006 14:30:11 +0200
+  [ Sven Luther ]
+  * Re-enabled fs-asfs patch.
+
+ -- Sven Luther <luther at debian.org>  Wed,  5 Jul 2006 23:25:30 +0200
 
 linux-2.6 (2.6.17-2) unstable; urgency=low
 

Copied: dists/trunk/linux-2.6/debian/patches/fs-asfs.patch (from r6949, /dists/trunk/linux-2.6/debian/patches/fs-asfs-2.patch)
==============================================================================
--- /dists/trunk/linux-2.6/debian/patches/fs-asfs-2.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/fs-asfs.patch	Wed Jul  5 21:39:23 2006
@@ -9,15 +9,15 @@
 diff -aurN a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
 --- a/Documentation/filesystems/00-INDEX	2005-06-06 11:22:29.000000000 -0400
 +++ b/Documentation/filesystems/00-INDEX	2005-06-15 22:05:09.000000000 -0400
-@@ -6,6 +6,8 @@
- 	- info and mount options for the Acorn Advanced Disc Filing System.
+@@ -10,6 +10,8 @@
+ 	- info and examples for the distributed AFS (Andrew File System) fs.
  affs.txt
  	- info and mount options for the Amiga Fast File System.
 +asfs.txt
 +	- info and mount options for the Amiga Smart File System.
- bfs.txt
- 	- info for the SCO UnixWare Boot Filesystem (BFS).
- cifs.txt
+ automount-support.txt
+ 	- information about filesystem automount support.
+ befs.txt
 diff -aurN a/Documentation/filesystems/asfs.txt b/Documentation/filesystems/asfs.txt
 --- a/Documentation/filesystems/asfs.txt	1969-12-31 19:00:00.000000000 -0500
 +++ b/Documentation/filesystems/asfs.txt	2005-06-15 22:05:09.000000000 -0400

Modified: dists/trunk/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/3	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/3	Wed Jul  5 21:39:23 2006
@@ -1,3 +1,5 @@
 - sparc32-iotlb.patch
 + 2.6.17.2
 + 2.6.17.3
++ fs-asfs.patch
+