aufs: Update to aufs3.1-20111031

svn path=/dists/trunk/linux-2.6/; revision=18205
This commit is contained in:
Ben Hutchings 2011-10-31 04:16:58 +00:00
parent 91b0f2c5df
commit 66c5e8bac1
5 changed files with 6 additions and 6 deletions

2
debian/changelog vendored
View File

@ -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 * [powerpc/powerpc64] Add missing #include to LPAR console selection fix
* Make kernel-wedge package checks non-fatal in experimental builds * Make kernel-wedge package checks non-fatal in experimental builds
* [x86/!486] Enable INTEL_IDLE * [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 ] [ Bastian Blank ]
* Use xz compression for debug packages. * Use xz compression for debug packages.

View File

@ -28486,7 +28486,7 @@
+ return err; + return err;
+} +}
--- a/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100 --- 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 @@ @@ -0,0 +1,220 @@
+/* +/*
+ * Copyright (C) 2005-2011 Junjiro R. Okajima + * Copyright (C) 2005-2011 Junjiro R. Okajima
@ -28514,7 +28514,7 @@
+#include <linux/limits.h> +#include <linux/limits.h>
+#include <linux/types.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 */ +/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

View File

@ -1,4 +1,4 @@
aufs3.x-rcN base patch aufs3.1 base patch
diff --git a/fs/namei.c b/fs/namei.c diff --git a/fs/namei.c b/fs/namei.c
index 0b3138d..8edad02 100644 index 0b3138d..8edad02 100644

View File

@ -1,4 +1,4 @@
aufs3.x-rcN kbuild patch aufs3.1 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig diff --git a/fs/Kconfig b/fs/Kconfig
index 9fe0b34..c4311f8 100644 index 9fe0b34..c4311f8 100644

View File

@ -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 diff --git a/fs/file_table.c b/fs/file_table.c
index c322794..2aad244 100644 index c322794..2aad244 100644