diff options
| author | Sven Luther <sven@powerlinux.fr> | 2006-07-05 21:39:23 +0000 |
|---|---|---|
| committer | Sven Luther <sven@powerlinux.fr> | 2006-07-05 21:39:23 +0000 |
| commit | 16e300a66726847b19e339207ca3a633ccc87fe1 (patch) | |
| tree | 941e5f9ace8a9c5d8167ecce6d00efc6950b01a3 | |
| parent | 00b798516d5df593474e1e47bc3a99bec9d25e06 (diff) | |
| download | kernel_replicant_linux-16e300a66726847b19e339207ca3a633ccc87fe1.tar.gz kernel_replicant_linux-16e300a66726847b19e339207ca3a633ccc87fe1.tar.bz2 kernel_replicant_linux-16e300a66726847b19e339207ca3a633ccc87fe1.zip | |
Fixed trivial mis-applying asfs hunk, and readded it.
svn path=/dists/trunk/linux-2.6/; revision=6951
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/fs-asfs.patch (renamed from debian/patches/fs-asfs-2.patch) | 10 | ||||
| -rw-r--r-- | debian/patches/series/3 | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 6198a9e3d63d..85127d12106b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 @@ linux-2.6 (2.6.17-3) UNRELEASED; urgency=low 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@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 diff --git a/debian/patches/fs-asfs-2.patch b/debian/patches/fs-asfs.patch index e3d37697fbd5..03fa7dc25607 100644 --- a/debian/patches/fs-asfs-2.patch +++ b/debian/patches/fs-asfs.patch @@ -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 diff --git a/debian/patches/series/3 b/debian/patches/series/3 index fecdab30c911..bdd90d5b8217 100644 --- a/debian/patches/series/3 +++ b/debian/patches/series/3 @@ -1,3 +1,5 @@ - sparc32-iotlb.patch + 2.6.17.2 + 2.6.17.3 ++ fs-asfs.patch + |