From 84cbf51404c4c4472927bd9d89941e82e75092f5 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Mon, 29 Oct 2012 03:33:44 +0000
Subject: [PATCH] aufs: Update to aufs3.6-20121015 (no functional change)

svn path=/dists/trunk/linux/; revision=19463
---
 debian/changelog                              |   2 +-
 .../features/all/aufs3/aufs3-add.patch        | 140 +++++++++---------
 .../features/all/aufs3/aufs3-base.patch       |   2 +-
 .../features/all/aufs3/aufs3-kbuild.patch     |   2 +-
 .../features/all/aufs3/aufs3-standalone.patch |   4 +-
 5 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 962e5b9b5..382171df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ linux (3.6.4-1~experimental.1) UNRELEASED; urgency=low
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.4
 
   [ Ben Hutchings ]
-  * aufs: Update to aufs3.x-rcN-20120827
+  * aufs: Update to aufs3.6-20121015
   * cirrus: Disable by default, as it is currently incompatible with
     xserver-xorg-video-cirrus. It can be forced to load with module
     parameter modeset=1.
diff --git a/debian/patches/features/all/aufs3/aufs3-add.patch b/debian/patches/features/all/aufs3/aufs3-add.patch
index fd529d26d..2b19a957c 100644
--- a/debian/patches/features/all/aufs3/aufs3-add.patch
+++ b/debian/patches/features/all/aufs3/aufs3-add.patch
@@ -1,5 +1,5 @@
 --- a/fs/aufs/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/Kconfig	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/Kconfig	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,203 @@
 +config AUFS_FS
 +	tristate "Aufs (Advanced multi layered unification filesystem) support"
@@ -205,7 +205,7 @@
 +	When aufs supports Magic SysRq, enabled automatically.
 +endif
 --- a/fs/aufs/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/Makefile	2012-08-01 03:41:52.619414717 +0100
++++ b/fs/aufs/Makefile	2012-08-01 03:41:52.000000000 +0100
 @@ -0,0 +1,42 @@
 +
 +include ${src}/magic.mk
@@ -250,7 +250,7 @@
 +aufs-$(CONFIG_AUFS_DEBUG) += debug.o
 +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
 --- a/fs/aufs/aufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/aufs.h	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/aufs.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,60 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -313,7 +313,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_H__ */
 --- a/fs/aufs/branch.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/branch.c	2012-10-10 02:27:30.002284137 +0100
++++ b/fs/aufs/branch.c	2012-10-29 03:30:14.227048051 +0000
 @@ -0,0 +1,1169 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -1485,7 +1485,7 @@
 +	return err;
 +}
 --- a/fs/aufs/branch.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/branch.h	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/branch.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,230 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -1718,7 +1718,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_BRANCH_H__ */
 --- a/fs/aufs/conf.mk	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/conf.mk	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/conf.mk	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,38 @@
 +
 +AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
@@ -1759,7 +1759,7 @@
 +
 +-include ${srctree}/${src}/conf_priv.mk
 --- a/fs/aufs/cpup.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/cpup.c	2012-10-10 02:27:30.002284137 +0100
++++ b/fs/aufs/cpup.c	2012-10-29 03:30:14.227048051 +0000
 @@ -0,0 +1,1085 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -2847,7 +2847,7 @@
 +	return err;
 +}
 --- a/fs/aufs/cpup.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/cpup.h	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/cpup.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,81 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -2931,7 +2931,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_CPUP_H__ */
 --- a/fs/aufs/dbgaufs.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dbgaufs.c	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/dbgaufs.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,334 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -3268,7 +3268,7 @@
 +	return err;
 +}
 --- a/fs/aufs/dbgaufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dbgaufs.h	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/dbgaufs.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,49 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -3320,7 +3320,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __DBGAUFS_H__ */
 --- a/fs/aufs/dcsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dcsub.c	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/dcsub.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,243 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -3566,7 +3566,7 @@
 +	return path_is_under(path + 0, path + 1);
 +}
 --- a/fs/aufs/dcsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dcsub.h	2012-01-10 02:15:56.545455955 +0000
++++ b/fs/aufs/dcsub.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,94 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -3663,7 +3663,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_DCSUB_H__ */
 --- a/fs/aufs/debug.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/debug.c	2012-10-10 02:27:30.002284137 +0100
++++ b/fs/aufs/debug.c	2012-10-29 03:30:14.227048051 +0000
 @@ -0,0 +1,490 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4156,7 +4156,7 @@
 +	return 0;
 +}
 --- a/fs/aufs/debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/debug.h	2012-07-22 01:31:00.162115458 +0100
++++ b/fs/aufs/debug.h	2012-10-29 03:30:14.231048075 +0000
 @@ -0,0 +1,242 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4401,7 +4401,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_DEBUG_H__ */
 --- a/fs/aufs/dentry.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dentry.c	2012-10-10 02:27:30.002284137 +0100
++++ b/fs/aufs/dentry.c	2012-10-29 03:30:14.231048075 +0000
 @@ -0,0 +1,1063 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5467,7 +5467,7 @@
 +	.d_release	= aufs_d_release
 +};
 --- a/fs/aufs/dentry.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dentry.h	2012-10-10 02:27:30.002284137 +0100
++++ b/fs/aufs/dentry.h	2012-10-29 03:30:14.231048075 +0000
 @@ -0,0 +1,235 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5705,7 +5705,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_DENTRY_H__ */
 --- a/fs/aufs/dinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dinfo.c	2012-01-10 02:15:56.549455982 +0000
++++ b/fs/aufs/dinfo.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,543 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -6251,7 +6251,7 @@
 +	return -1;
 +}
 --- a/fs/aufs/dir.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dir.c	2012-10-10 02:27:30.006284153 +0100
++++ b/fs/aufs/dir.c	2012-10-29 03:30:14.231048075 +0000
 @@ -0,0 +1,633 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -6887,7 +6887,7 @@
 +	.fsync		= aufs_fsync_dir
 +};
 --- a/fs/aufs/dir.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dir.h	2012-01-10 02:15:56.549455982 +0000
++++ b/fs/aufs/dir.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,137 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -7027,7 +7027,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_DIR_H__ */
 --- a/fs/aufs/dynop.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dynop.c	2012-10-10 02:27:30.006284153 +0100
++++ b/fs/aufs/dynop.c	2012-10-29 03:30:14.231048075 +0000
 @@ -0,0 +1,379 @@
 +/*
 + * Copyright (C) 2010-2012 Junjiro R. Okajima
@@ -7409,7 +7409,7 @@
 +		WARN_ON(!list_empty(&dynop[i].head));
 +}
 --- a/fs/aufs/dynop.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dynop.h	2012-01-10 02:15:56.549455982 +0000
++++ b/fs/aufs/dynop.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,76 @@
 +/*
 + * Copyright (C) 2010-2012 Junjiro R. Okajima
@@ -7488,7 +7488,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_DYNOP_H__ */
 --- a/fs/aufs/export.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/export.c	2012-10-10 02:27:30.006284153 +0100
++++ b/fs/aufs/export.c	2012-10-29 03:30:14.235048090 +0000
 @@ -0,0 +1,811 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -8302,7 +8302,7 @@
 +	atomic_set(&sbinfo->si_xigen_next, u);
 +}
 --- a/fs/aufs/f_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/f_op.c	2012-10-10 02:27:30.006284153 +0100
++++ b/fs/aufs/f_op.c	2012-10-29 03:30:14.235048090 +0000
 @@ -0,0 +1,724 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -9029,7 +9029,7 @@
 +#endif
 +};
 --- a/fs/aufs/f_op_sp.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/f_op_sp.c	2012-07-22 01:31:00.162115458 +0100
++++ b/fs/aufs/f_op_sp.c	2012-10-29 03:30:14.235048090 +0000
 @@ -0,0 +1,295 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -9327,7 +9327,7 @@
 +	return ret;
 +}
 --- a/fs/aufs/file.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/file.c	2012-10-10 02:27:30.018284201 +0100
++++ b/fs/aufs/file.c	2012-10-29 03:30:14.235048090 +0000
 @@ -0,0 +1,683 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -10013,7 +10013,7 @@
 +#endif /* CONFIG_AUFS_DEBUG */
 +};
 --- a/fs/aufs/file.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/file.h	2012-08-01 03:41:52.619414717 +0100
++++ b/fs/aufs/file.h	2012-08-01 03:41:52.000000000 +0100
 @@ -0,0 +1,298 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -10314,7 +10314,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_FILE_H__ */
 --- a/fs/aufs/finfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/finfo.c	2012-01-10 02:15:56.549455982 +0000
++++ b/fs/aufs/finfo.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,156 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -10473,7 +10473,7 @@
 +	return err;
 +}
 --- a/fs/aufs/fstype.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/fstype.h	2012-10-10 02:27:30.018284201 +0100
++++ b/fs/aufs/fstype.h	2012-10-29 03:30:14.235048090 +0000
 @@ -0,0 +1,481 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -10957,7 +10957,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_FSTYPE_H__ */
 --- a/fs/aufs/hfsnotify.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/hfsnotify.c	2012-07-22 01:31:00.162115458 +0100
++++ b/fs/aufs/hfsnotify.c	2012-10-29 03:30:14.235048090 +0000
 @@ -0,0 +1,257 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -11217,7 +11217,7 @@
 +	.init_br	= au_hfsn_init_br
 +};
 --- a/fs/aufs/hfsplus.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/hfsplus.c	2012-01-10 02:15:56.553455997 +0000
++++ b/fs/aufs/hfsplus.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,57 @@
 +/*
 + * Copyright (C) 2010-2012 Junjiro R. Okajima
@@ -11277,7 +11277,7 @@
 +	}
 +}
 --- a/fs/aufs/hnotify.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/hnotify.c	2012-10-10 02:27:30.018284201 +0100
++++ b/fs/aufs/hnotify.c	2012-10-29 03:30:14.235048090 +0000
 @@ -0,0 +1,713 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -11993,7 +11993,7 @@
 +		au_hn_destroy_cache();
 +}
 --- a/fs/aufs/i_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/i_op.c	2012-10-10 02:27:30.018284201 +0100
++++ b/fs/aufs/i_op.c	2012-10-29 03:30:14.239048114 +0000
 @@ -0,0 +1,1009 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -13005,7 +13005,7 @@
 +	.update_time	= aufs_update_time
 +};
 --- a/fs/aufs/i_op_add.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/i_op_add.c	2012-10-10 02:27:30.018284201 +0100
++++ b/fs/aufs/i_op_add.c	2012-10-29 03:30:14.239048114 +0000
 @@ -0,0 +1,712 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -13720,7 +13720,7 @@
 +	return err;
 +}
 --- a/fs/aufs/i_op_del.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/i_op_del.c	2012-10-10 02:27:30.018284201 +0100
++++ b/fs/aufs/i_op_del.c	2012-10-29 03:30:14.239048114 +0000
 @@ -0,0 +1,478 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -14201,7 +14201,7 @@
 +	return err;
 +}
 --- a/fs/aufs/i_op_ren.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/i_op_ren.c	2012-10-10 02:27:30.018284201 +0100
++++ b/fs/aufs/i_op_ren.c	2012-10-29 03:30:14.239048114 +0000
 @@ -0,0 +1,1026 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -15230,7 +15230,7 @@
 +	return err;
 +}
 --- a/fs/aufs/iinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/iinfo.c	2012-01-10 02:15:56.557456016 +0000
++++ b/fs/aufs/iinfo.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,264 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -15497,7 +15497,7 @@
 +	AuRwDestroy(&iinfo->ii_rwsem);
 +}
 --- a/fs/aufs/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/inode.c	2012-10-10 02:27:30.018284201 +0100
++++ b/fs/aufs/inode.c	2012-10-29 03:30:14.239048114 +0000
 @@ -0,0 +1,478 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -15978,7 +15978,7 @@
 +	return au_test_h_perm(h_inode, mask);
 +}
 --- a/fs/aufs/inode.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/inode.h	2012-10-10 02:27:30.022284240 +0100
++++ b/fs/aufs/inode.h	2012-10-29 03:30:14.243048129 +0000
 @@ -0,0 +1,560 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -16541,7 +16541,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_INODE_H__ */
 --- a/fs/aufs/ioctl.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/ioctl.c	2012-01-10 02:15:56.557456016 +0000
++++ b/fs/aufs/ioctl.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,196 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -16740,7 +16740,7 @@
 +#endif
 +#endif
 --- a/fs/aufs/loop.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/loop.c	2012-07-22 01:31:00.162115458 +0100
++++ b/fs/aufs/loop.c	2012-07-22 01:31:00.000000000 +0100
 @@ -0,0 +1,133 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -16876,7 +16876,7 @@
 +	kfree(au_warn_loopback_array);
 +}
 --- a/fs/aufs/loop.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/loop.h	2012-01-10 02:15:56.557456016 +0000
++++ b/fs/aufs/loop.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -16929,7 +16929,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_LOOP_H__ */
 --- a/fs/aufs/magic.mk	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/magic.mk	2012-01-10 02:15:56.557456016 +0000
++++ b/fs/aufs/magic.mk	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,54 @@
 +
 +# defined in ${srctree}/fs/fuse/inode.c
@@ -16986,7 +16986,7 @@
 +ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b
 +endif
 --- a/fs/aufs/module.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/module.c	2012-03-11 05:01:22.570973560 +0000
++++ b/fs/aufs/module.c	2012-03-11 05:01:22.000000000 +0000
 @@ -0,0 +1,196 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -17185,7 +17185,7 @@
 +module_init(aufs_init);
 +module_exit(aufs_exit);
 --- a/fs/aufs/module.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/module.h	2012-03-11 05:01:22.570973560 +0000
++++ b/fs/aufs/module.h	2012-03-11 05:01:22.000000000 +0000
 @@ -0,0 +1,105 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -17293,7 +17293,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_MODULE_H__ */
 --- a/fs/aufs/opts.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/opts.c	2012-07-22 01:31:00.166115467 +0100
++++ b/fs/aufs/opts.c	2012-07-22 01:31:00.000000000 +0100
 @@ -0,0 +1,1677 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -18973,7 +18973,7 @@
 +	return au_mntflags(sb) & AuOptMask_UDBA;
 +}
 --- a/fs/aufs/opts.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/opts.h	2012-01-10 02:15:56.561456041 +0000
++++ b/fs/aufs/opts.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,209 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -19185,7 +19185,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_OPTS_H__ */
 --- a/fs/aufs/plink.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/plink.c	2012-10-10 02:27:30.022284240 +0100
++++ b/fs/aufs/plink.c	2012-10-29 03:30:14.243048129 +0000
 @@ -0,0 +1,511 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -19699,7 +19699,7 @@
 +	}
 +}
 --- a/fs/aufs/poll.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/poll.c	2012-01-10 02:15:56.561456041 +0000
++++ b/fs/aufs/poll.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,56 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -19758,7 +19758,7 @@
 +	return mask;
 +}
 --- a/fs/aufs/procfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/procfs.c	2012-01-10 02:15:56.561456041 +0000
++++ b/fs/aufs/procfs.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,170 @@
 +/*
 + * Copyright (C) 2010-2012 Junjiro R. Okajima
@@ -19931,7 +19931,7 @@
 +	return err;
 +}
 --- a/fs/aufs/rdu.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/rdu.c	2012-06-04 21:49:59.854840268 +0100
++++ b/fs/aufs/rdu.c	2012-10-29 03:30:14.243048129 +0000
 @@ -0,0 +1,384 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -20318,7 +20318,7 @@
 +}
 +#endif
 --- a/fs/aufs/rwsem.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/rwsem.h	2012-01-10 02:15:56.561456041 +0000
++++ b/fs/aufs/rwsem.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,188 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -20509,7 +20509,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_RWSEM_H__ */
 --- a/fs/aufs/sbinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sbinfo.c	2012-01-10 02:15:56.561456041 +0000
++++ b/fs/aufs/sbinfo.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,343 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -20855,7 +20855,7 @@
 +	spin_unlock(&sbinfo->au_si_pid.tree_lock);
 +}
 --- a/fs/aufs/spl.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/spl.h	2012-01-10 02:15:56.561456041 +0000
++++ b/fs/aufs/spl.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,62 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -20920,7 +20920,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_SPL_H__ */
 --- a/fs/aufs/super.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/super.c	2012-10-10 02:27:30.022284240 +0100
++++ b/fs/aufs/super.c	2012-10-29 03:30:14.243048129 +0000
 @@ -0,0 +1,962 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -21885,7 +21885,7 @@
 +	.owner		= THIS_MODULE,
 +};
 --- a/fs/aufs/super.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/super.h	2012-01-10 02:15:56.569456073 +0000
++++ b/fs/aufs/super.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,546 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -22434,7 +22434,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_SUPER_H__ */
 --- a/fs/aufs/sysaufs.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sysaufs.c	2012-01-10 02:15:56.569456073 +0000
++++ b/fs/aufs/sysaufs.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,105 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -22542,7 +22542,7 @@
 +	return err;
 +}
 --- a/fs/aufs/sysaufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sysaufs.h	2012-01-10 02:15:56.569456073 +0000
++++ b/fs/aufs/sysaufs.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,104 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -22649,7 +22649,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __SYSAUFS_H__ */
 --- a/fs/aufs/sysfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sysfs.c	2012-07-22 01:31:00.166115467 +0100
++++ b/fs/aufs/sysfs.c	2012-07-22 01:31:00.000000000 +0100
 @@ -0,0 +1,257 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -22909,7 +22909,7 @@
 +	}
 +}
 --- a/fs/aufs/sysrq.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sysrq.c	2012-10-10 02:27:30.022284240 +0100
++++ b/fs/aufs/sysrq.c	2012-10-29 03:30:14.243048129 +0000
 @@ -0,0 +1,148 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -23060,7 +23060,7 @@
 +		pr_err("err %d (ignored)\n", err);
 +}
 --- a/fs/aufs/vdir.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/vdir.c	2012-01-10 02:15:56.569456073 +0000
++++ b/fs/aufs/vdir.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,885 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -23948,7 +23948,7 @@
 +	return 0;
 +}
 --- a/fs/aufs/vfsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/vfsub.c	2012-10-10 02:27:30.022284240 +0100
++++ b/fs/aufs/vfsub.c	2012-10-29 03:30:14.243048129 +0000
 @@ -0,0 +1,777 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -24728,7 +24728,7 @@
 +	return err;
 +}
 --- a/fs/aufs/vfsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/vfsub.h	2012-10-10 02:27:30.022284240 +0100
++++ b/fs/aufs/vfsub.h	2012-10-29 03:30:14.243048129 +0000
 @@ -0,0 +1,283 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -25014,7 +25014,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_VFSUB_H__ */
 --- a/fs/aufs/wbr_policy.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/wbr_policy.c	2012-01-10 02:15:56.569456073 +0000
++++ b/fs/aufs/wbr_policy.c	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,700 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -25717,7 +25717,7 @@
 +	}
 +};
 --- a/fs/aufs/whout.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/whout.c	2012-10-10 02:27:30.022284240 +0100
++++ b/fs/aufs/whout.c	2012-10-29 03:30:14.247048152 +0000
 @@ -0,0 +1,1042 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -26762,7 +26762,7 @@
 +	}
 +}
 --- a/fs/aufs/whout.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/whout.h	2012-01-10 02:15:56.573456100 +0000
++++ b/fs/aufs/whout.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,88 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -26853,7 +26853,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_WHOUT_H__ */
 --- a/fs/aufs/wkq.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/wkq.c	2012-10-10 02:27:30.022284240 +0100
++++ b/fs/aufs/wkq.c	2012-10-29 03:30:14.247048152 +0000
 @@ -0,0 +1,214 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -27070,7 +27070,7 @@
 +	return err;
 +}
 --- a/fs/aufs/wkq.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/wkq.h	2012-01-10 02:15:56.573456100 +0000
++++ b/fs/aufs/wkq.h	2012-01-10 02:15:56.000000000 +0000
 @@ -0,0 +1,92 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -27165,7 +27165,7 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_WKQ_H__ */
 --- a/fs/aufs/xino.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/xino.c	2012-07-22 01:31:00.166115467 +0100
++++ b/fs/aufs/xino.c	2012-07-22 01:31:00.000000000 +0100
 @@ -0,0 +1,1264 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -28432,7 +28432,7 @@
 +	return err;
 +}
 --- a/include/linux/aufs_type.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/include/linux/aufs_type.h	2012-10-10 02:27:30.022284240 +0100
++++ b/include/linux/aufs_type.h	2012-10-29 03:30:14.247048152 +0000
 @@ -0,0 +1,233 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -28475,7 +28475,7 @@
 +
 +#include <linux/limits.h>
 +
-+#define AUFS_VERSION	"3.x-rcN-20120827"
++#define AUFS_VERSION	"3.6-20121015"
 +
 +/* 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 7fa262008..adb9ab7cc 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.6 base patch
 
 diff --git a/fs/inode.c b/fs/inode.c
 index ac8d904..7b2c8fa 100644
diff --git a/debian/patches/features/all/aufs3/aufs3-kbuild.patch b/debian/patches/features/all/aufs3/aufs3-kbuild.patch
index d28eb1267..d9ba9ab81 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.6 kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
 index f95ae3a..6d8a9a5 100644
diff --git a/debian/patches/features/all/aufs3/aufs3-standalone.patch b/debian/patches/features/all/aufs3/aufs3-standalone.patch
index db132ae87..d02980b41 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.6 standalone patch
 
 diff --git a/fs/file_table.c b/fs/file_table.c
 index 701985e..a9fe741 100644
@@ -42,7 +42,7 @@ index 7b2c8fa..0c4318d 100644
  /**
   *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 4d31f73..fe1eca1 100644
+index 7bdf790..5b85c4c 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj);