diff options
author | Ben Hutchings <benh@debian.org> | 2011-10-31 04:16:58 +0000 |
---|---|---|
committer | Ben Hutchings <benh@debian.org> | 2011-10-31 04:16:58 +0000 |
commit | 66c5e8bac1c726d088fadc46c98d8a96adab73da (patch) | |
tree | ed27240780c5d02a507e8a5d2c46a3711f403bbd | |
parent | 91b0f2c5dfcfdae931ba5bf5ec8afbaff86e80bf (diff) | |
download | kernel_replicant_linux-66c5e8bac1c726d088fadc46c98d8a96adab73da.tar.gz kernel_replicant_linux-66c5e8bac1c726d088fadc46c98d8a96adab73da.tar.bz2 kernel_replicant_linux-66c5e8bac1c726d088fadc46c98d8a96adab73da.zip |
aufs: Update to aufs3.1-20111031
svn path=/dists/trunk/linux-2.6/; revision=18205
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/patches/features/all/aufs3/aufs3-add.patch | 4 | ||||
-rw-r--r-- | debian/patches/features/all/aufs3/aufs3-base.patch | 2 | ||||
-rw-r--r-- | debian/patches/features/all/aufs3/aufs3-kbuild.patch | 2 | ||||
-rw-r--r-- | debian/patches/features/all/aufs3/aufs3-standalone.patch | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index f7d03b6b0b09..042397bee9c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ linux-2.6 (3.1.0-1~experimental.1) UNRELEASED; urgency=low * [powerpc/powerpc64] Add missing #include to LPAR console selection fix * Make kernel-wedge package checks non-fatal in experimental builds * [x86/!486] Enable INTEL_IDLE - * aufs: Update to aufs3 for Linux 3.1 (Closes: #644687) + * aufs: Update to aufs3.1-20111031 (Closes: #644687) [ Bastian Blank ] * Use xz compression for debug packages. diff --git a/debian/patches/features/all/aufs3/aufs3-add.patch b/debian/patches/features/all/aufs3/aufs3-add.patch index fb1051b61bb4..6883e2403eff 100644 --- a/debian/patches/features/all/aufs3/aufs3-add.patch +++ b/debian/patches/features/all/aufs3/aufs3-add.patch @@ -28486,7 +28486,7 @@ + return err; +} --- a/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/linux/aufs_type.h 2011-10-29 11:40:05.623788233 +0100 ++++ b/include/linux/aufs_type.h 2011-10-31 04:11:18.522727651 +0000 @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2005-2011 Junjiro R. Okajima @@ -28514,7 +28514,7 @@ +#include <linux/limits.h> +#include <linux/types.h> + -+#define AUFS_VERSION "3.x-rcN-20111024" ++#define AUFS_VERSION "3.1-20111031" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') diff --git a/debian/patches/features/all/aufs3/aufs3-base.patch b/debian/patches/features/all/aufs3/aufs3-base.patch index a68202132680..928c3cec768c 100644 --- a/debian/patches/features/all/aufs3/aufs3-base.patch +++ b/debian/patches/features/all/aufs3/aufs3-base.patch @@ -1,4 +1,4 @@ -aufs3.x-rcN base patch +aufs3.1 base patch diff --git a/fs/namei.c b/fs/namei.c index 0b3138d..8edad02 100644 diff --git a/debian/patches/features/all/aufs3/aufs3-kbuild.patch b/debian/patches/features/all/aufs3/aufs3-kbuild.patch index 1d2754066332..d96b7f9a5971 100644 --- a/debian/patches/features/all/aufs3/aufs3-kbuild.patch +++ b/debian/patches/features/all/aufs3/aufs3-kbuild.patch @@ -1,4 +1,4 @@ -aufs3.x-rcN kbuild patch +aufs3.1 kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig index 9fe0b34..c4311f8 100644 diff --git a/debian/patches/features/all/aufs3/aufs3-standalone.patch b/debian/patches/features/all/aufs3/aufs3-standalone.patch index e36ae72df9a9..8a290df0b039 100644 --- a/debian/patches/features/all/aufs3/aufs3-standalone.patch +++ b/debian/patches/features/all/aufs3/aufs3-standalone.patch @@ -1,4 +1,4 @@ -aufs3.x-rcN standalone patch +aufs3.1 standalone patch diff --git a/fs/file_table.c b/fs/file_table.c index c322794..2aad244 100644 |