[kernel] r18205 - in dists/trunk/linux-2.6/debian: . patches/features/all/aufs3

[Ben Hutchings]

Author: benh
Date: Mon Oct 31 04:16:58 2011
New Revision: 18205

Log:
aufs: Update to aufs3.1-20111031

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-add.patch
   dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-base.patch
   dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-kbuild.patch
   dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-standalone.patch

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Oct 31 04:05:25 2011	(r18204)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Oct 31 04:16:58 2011	(r18205)
@@ -11,7 +11,7 @@
   * [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.

Modified: dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-add.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-add.patch	Mon Oct 31 04:05:25 2011	(r18204)
+++ dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-add.patch	Mon Oct 31 04:16:58 2011	(r18205)
@@ -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')

Modified: dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-base.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-base.patch	Mon Oct 31 04:05:25 2011	(r18204)
+++ dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-base.patch	Mon Oct 31 04:16:58 2011	(r18205)
@@ -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

Modified: dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-kbuild.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-kbuild.patch	Mon Oct 31 04:05:25 2011	(r18204)
+++ dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-kbuild.patch	Mon Oct 31 04:16:58 2011	(r18205)
@@ -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

Modified: dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-standalone.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-standalone.patch	Mon Oct 31 04:05:25 2011	(r18204)
+++ dists/trunk/linux-2.6/debian/patches/features/all/aufs3/aufs3-standalone.patch	Mon Oct 31 04:16:58 2011	(r18205)
@@ -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