From patchwork Fri May 13 09:33:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 621908 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3r5l6j2q8dz9t6M; Fri, 13 May 2016 19:34:05 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1b19Tr-0006WU-Ir; Fri, 13 May 2016 09:33:59 +0000 Received: from mail-wm0-f45.google.com ([74.125.82.45]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.76) (envelope-from ) id 1b19Ti-0006W3-36 for kernel-team@lists.ubuntu.com; Fri, 13 May 2016 09:33:50 +0000 Received: by mail-wm0-f45.google.com with SMTP id g17so20114347wme.1 for ; Fri, 13 May 2016 02:33:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tNJ/BG1q7Nsb5R/79Yfpg2C0qg21eF+F54czY4vOTz4=; b=i0TgdKGJoKv5dFyf7R/loCipHGF+vnLNcWN8gNx4cSq66FypQThktlKiqJfvjFi318 aMKCenqwpBUhoe/tMyHckHx6NTiaJt/aRmFfr3YwdcJnXpWatVvNjO4Yw7QRVKeEUyOC M4Fe9gNdfBwXQyf5w3I038dkkjG7qOzluVKcPBfKxvqGhgcWMqoR3ReKNCCK4vQNPKGd T1/ZcRL1Jju4dj9Rm2glm+WQ3JBhVthmJ4JVsPTyZJXWZ9oUuxhbdd4ddxyWYg8eh1X9 +2He2vg3bJEtRJxVY7N2RwlZX51NA6YlMV2uJnT/RALd6qCmHwjO+sjb46yvwio3WiX4 Jwow== X-Gm-Message-State: AOPr4FX+Hud1nVfO3/Vxt9s7hxd3eBgYXRzuLitB1CAhU6e8W997mm+oPvCtbOtSVWhHU2FX X-Received: by 10.28.165.216 with SMTP id o207mr2450781wme.31.1463132029320; Fri, 13 May 2016 02:33:49 -0700 (PDT) Received: from localhost ([2001:470:6973:2:7144:7ff5:41f9:85aa]) by smtp.gmail.com with ESMTPSA id yr1sm17658058wjc.9.2016.05.13.02.33.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 May 2016 02:33:48 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [xenial/master-next 1/1] UBUNTU: [Config] enable CONFIG_AUFS_EXPORT Date: Fri, 13 May 2016 10:33:44 +0100 Message-Id: <1463132024-1113-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463132024-1113-1-git-send-email-apw@canonical.com> References: <1463132024-1113-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1121699 Signed-off-by: Andy Whitcroft --- debian.master/config/annotations | 4 +++- debian.master/config/config.common.ubuntu | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 2a3ae21..7eb4dce 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -7350,7 +7350,7 @@ CONFIG_LOGFS note # Menu: File systems >> Miscellaneous filesystems >> Aufs (Advanced multi layered unification filesystem) support CONFIG_AUFS_FS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_AUFS_HNOTIFY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> -CONFIG_AUFS_EXPORT policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_AUFS_EXPORT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_AUFS_XATTR policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_AUFS_FHSM policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_AUFS_RDU policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> @@ -7359,6 +7359,8 @@ CONFIG_AUFS_BR_RAMFS policy<{'amd64': 'n', 'arm64': ' CONFIG_AUFS_BR_FUSE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_AUFS_BR_HFSPLUS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}> CONFIG_AUFS_DEBUG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> +# +CONFIG_AUFS_EXPORT note # Menu: File systems >> Miscellaneous filesystems >> Aufs (Advanced multi layered unification filesystem) support >> Maximum number of branches CONFIG_AUFS_BRANCH_MAX_127 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e12fd89..922e854 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -703,10 +703,11 @@ CONFIG_AUFS_BRANCH_MAX_127=y CONFIG_AUFS_BR_HFSPLUS=y # CONFIG_AUFS_BR_RAMFS is not set # CONFIG_AUFS_DEBUG is not set -# CONFIG_AUFS_EXPORT is not set +CONFIG_AUFS_EXPORT=y # CONFIG_AUFS_FHSM is not set CONFIG_AUFS_FS=m # CONFIG_AUFS_HNOTIFY is not set +CONFIG_AUFS_INO_T_64=y # CONFIG_AUFS_RDU is not set CONFIG_AUFS_SBILIST=y # CONFIG_AUFS_SHWH is not set