From patchwork Thu Jul 15 19:30:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 59038 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 68899B6F06 for ; Fri, 16 Jul 2010 05:30:35 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OZU8X-0007zp-8w; Thu, 15 Jul 2010 20:30:25 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OZU8U-0007zc-My for kernel-team@lists.ubuntu.com; Thu, 15 Jul 2010 20:30:22 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OZU8U-0002JG-GW for ; Thu, 15 Jul 2010 20:30:22 +0100 Received: from [85.210.144.189] (helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OZU8U-0000FM-5s for kernel-team@lists.ubuntu.com; Thu, 15 Jul 2010 20:30:22 +0100 Date: Thu, 15 Jul 2010 20:30:20 +0100 From: Andy Whitcroft To: Ubuntu Kernel Team Subject: [Maverick][pull request] aufs2 update to mainline Message-ID: <20100715193020.GE20746@shadowen.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Here is an update for aufs2 bringing us inline with the current upstream version. Changelog for the update patch contains the upstream changelog. For Maverick. -apw The following changes since commit 3b4dab04ff49dfd501d64025660851d1b497b649: Leann Ogasawara (1): UBUNTU: Ubuntu-2.6.35-8.13 are available in the git repository at: git://kernel.ubuntu.com/apw/ubuntu-maverick aufs2 Andy Whitcroft (2): UBUNTU: ubuntu: AUFS -- add BOM and automated update script UBUNTU: ubuntu: AUFS -- update to b37c575759dc4535ccc03241c584ad5fe69e3b25 ubuntu/aufs-update | 37 +++++++++ ubuntu/aufs/BOM | 2 + ubuntu/aufs/Makefile | 2 +- ubuntu/aufs/branch.c | 21 ++---- ubuntu/aufs/branch.h | 3 +- ubuntu/aufs/cpup.c | 18 +++-- ubuntu/aufs/debug.c | 9 +- ubuntu/aufs/dentry.c | 2 +- ubuntu/aufs/dir.c | 19 +---- ubuntu/aufs/dir.h | 11 +++ ubuntu/aufs/export.c | 23 +----- ubuntu/aufs/f_op.c | 12 ++- ubuntu/aufs/file.c | 4 +- ubuntu/aufs/file.h | 4 + ubuntu/aufs/hnotify.c | 8 -- ubuntu/aufs/i_op.c | 38 +++------ ubuntu/aufs/iinfo.c | 64 ++++++----------- ubuntu/aufs/include/linux/aufs_type.h | 6 +- ubuntu/aufs/inode.c | 45 +++++++++-- ubuntu/aufs/ioctl.c | 29 +++++++ ubuntu/aufs/loop.c | 13 ++- ubuntu/aufs/plink.c | 4 +- ubuntu/aufs/rdu.c | 61 ++++++++++++++-- ubuntu/aufs/sbinfo.c | 71 +++++++++++++++++- ubuntu/aufs/super.c | 1 + ubuntu/aufs/super.h | 130 +++++++++++++++++++++++++++++---- ubuntu/aufs/vfsub.c | 59 +++++---------- ubuntu/aufs/vfsub.h | 2 - ubuntu/aufs/wkq.c | 60 ++++++++++++--- ubuntu/aufs/wkq.h | 15 +++- ubuntu/aufs/xino.c | 108 +++++++++++++++++++++------ 31 files changed, 616 insertions(+), 265 deletions(-) create mode 100644 ubuntu/aufs-update create mode 100644 ubuntu/aufs/BOM --- /dev/null 2010-07-14 08:14:15.418230732 +0100 +++ X 2010-07-15 19:18:31.000000000 +0100 @@ -0,0 +1 @@ +hi patchworks