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

svn path=/dists/trunk/linux-2.6/; revision=6951
This commit is contained in:
Sven Luther 2006-07-05 21:39:23 +00:00
parent 00b798516d
commit 16e300a667
3 changed files with 12 additions and 6 deletions

6
debian/changelog vendored
View File

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

View File

@ -9,15 +9,15 @@
diff -aurN a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX 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 --- 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 +++ b/Documentation/filesystems/00-INDEX 2005-06-15 22:05:09.000000000 -0400
@@ -6,6 +6,8 @@ @@ -10,6 +10,8 @@
- info and mount options for the Acorn Advanced Disc Filing System. - info and examples for the distributed AFS (Andrew File System) fs.
affs.txt affs.txt
- info and mount options for the Amiga Fast File System. - info and mount options for the Amiga Fast File System.
+asfs.txt +asfs.txt
+ - info and mount options for the Amiga Smart File System. + - info and mount options for the Amiga Smart File System.
bfs.txt automount-support.txt
- info for the SCO UnixWare Boot Filesystem (BFS). - information about filesystem automount support.
cifs.txt befs.txt
diff -aurN a/Documentation/filesystems/asfs.txt b/Documentation/filesystems/asfs.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 --- 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 +++ b/Documentation/filesystems/asfs.txt 2005-06-15 22:05:09.000000000 -0400

View File

@ -1,3 +1,5 @@
- sparc32-iotlb.patch - sparc32-iotlb.patch
+ 2.6.17.2 + 2.6.17.2
+ 2.6.17.3 + 2.6.17.3
+ fs-asfs.patch