| Message ID | 1476111669-4257-1-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Oct 10, 2016 at 09:01:09AM -0600, Tim Gardner wrote: > BugLink: http://bugs.launchpad.net/bugs/1557776 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > > v2 - added annotations update. Looks good, but just to confirm - v1 says this is for xenial and v2 says yakkety. Looks like only yakkety needs this.
On 10/10/2016 08:01 AM, Tim Gardner wrote: > BugLink: http://bugs.launchpad.net/bugs/1557776 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> > --- > > v2 - added annotations update. > > debian.master/config/amd64/config.common.amd64 | 1 - > debian.master/config/annotations | 2 +- > debian.master/config/arm64/config.common.arm64 | 1 - > debian.master/config/armhf/config.common.armhf | 1 - > debian.master/config/config.common.ubuntu | 1 + > debian.master/config/i386/config.common.i386 | 1 - > debian.master/config/powerpc/config.common.powerpc | 1 - > debian.master/config/ppc64el/config.common.ppc64el | 1 - > debian.master/config/s390x/config.common.s390x | 1 - > 9 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index ebc2fda5..06dc0e4 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -46,7 +46,6 @@ CONFIG_ATA_OVER_ETH=m > CONFIG_ATA_PIIX=y > CONFIG_ATM=m > # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set > -# CONFIG_AUFS_XATTR is not set > CONFIG_AUXDISPLAY=y > CONFIG_BACKLIGHT_LCD_SUPPORT=y > # CONFIG_BATMAN_ADV_BATMAN_V is not set > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index 0c30ab3..93765d86 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -7360,7 +7360,7 @@ CONFIG_LOGFS note<highly discouraged for use> > 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': '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_XATTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> > 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'}> > CONFIG_AUFS_SHWH policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index d1d5f1c..f89c4c5 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -54,7 +54,6 @@ CONFIG_ATA_PIIX=m > # CONFIG_ATH10K_AHB is not set > CONFIG_ATM=m > CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y > -# CONFIG_AUFS_XATTR is not set > CONFIG_AUXDISPLAY=y > CONFIG_BACKLIGHT_LCD_SUPPORT=y > # CONFIG_BATMAN_ADV_BATMAN_V is not set > diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf > index fe69f6a..d8372a4 100644 > --- a/debian.master/config/armhf/config.common.armhf > +++ b/debian.master/config/armhf/config.common.armhf > @@ -47,7 +47,6 @@ CONFIG_ATA_PIIX=m > # CONFIG_ATH10K_AHB is not set > CONFIG_ATM=m > # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set > -# CONFIG_AUFS_XATTR is not set > CONFIG_AUXDISPLAY=y > CONFIG_BACKLIGHT_LCD_SUPPORT=y > # CONFIG_BATMAN_ADV_BATMAN_V is not set > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 16082d3..fdce2bf 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -736,6 +736,7 @@ CONFIG_AUFS_INO_T_64=y > # CONFIG_AUFS_RDU is not set > CONFIG_AUFS_SBILIST=y > # CONFIG_AUFS_SHWH is not set > +CONFIG_AUFS_XATTR=y > CONFIG_AURORA_NB8800=m > CONFIG_AUTOFS4_FS=m > CONFIG_AUTO_ZRELADDR=y > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index 0850972..053296f 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -44,7 +44,6 @@ CONFIG_ATA_OVER_ETH=m > CONFIG_ATA_PIIX=y > CONFIG_ATM=m > # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set > -# CONFIG_AUFS_XATTR is not set > CONFIG_AUXDISPLAY=y > CONFIG_BACKLIGHT_LCD_SUPPORT=y > # CONFIG_BATMAN_ADV_BATMAN_V is not set > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 51a634b..7493f2e 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -31,7 +31,6 @@ CONFIG_ATA_PIIX=m > CONFIG_ATH10K_AHB=y > CONFIG_ATM=m > # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set > -# CONFIG_AUFS_XATTR is not set > CONFIG_AUXDISPLAY=y > CONFIG_BACKLIGHT_LCD_SUPPORT=y > CONFIG_BCH=m > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index ed814f1..fe0665b 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -40,7 +40,6 @@ CONFIG_ATA_PIIX=m > CONFIG_ATH10K_AHB=y > CONFIG_ATM=m > # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set > -# CONFIG_AUFS_XATTR is not set > CONFIG_AUXDISPLAY=y > CONFIG_BACKLIGHT_LCD_SUPPORT=y > # CONFIG_BATMAN_ADV_BATMAN_V is not set > diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x > index 6397f99..ae97a7d 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -32,7 +32,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y > # CONFIG_ATA_OVER_ETH is not set > # CONFIG_ATM is not set > # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set > -CONFIG_AUFS_XATTR=y > # CONFIG_AUXDISPLAY is not set > # CONFIG_BACKLIGHT_LCD_SUPPORT is not set > # CONFIG_BCM7XXX_PHY is not set >
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index ebc2fda5..06dc0e4 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -46,7 +46,6 @@ CONFIG_ATA_OVER_ETH=m CONFIG_ATA_PIIX=y CONFIG_ATM=m # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set -# CONFIG_AUFS_XATTR is not set CONFIG_AUXDISPLAY=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 0c30ab3..93765d86 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -7360,7 +7360,7 @@ CONFIG_LOGFS note<highly discouraged for use> 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': '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_XATTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> 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'}> CONFIG_AUFS_SHWH policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index d1d5f1c..f89c4c5 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -54,7 +54,6 @@ CONFIG_ATA_PIIX=m # CONFIG_ATH10K_AHB is not set CONFIG_ATM=m CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -# CONFIG_AUFS_XATTR is not set CONFIG_AUXDISPLAY=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index fe69f6a..d8372a4 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -47,7 +47,6 @@ CONFIG_ATA_PIIX=m # CONFIG_ATH10K_AHB is not set CONFIG_ATM=m # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set -# CONFIG_AUFS_XATTR is not set CONFIG_AUXDISPLAY=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 16082d3..fdce2bf 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -736,6 +736,7 @@ CONFIG_AUFS_INO_T_64=y # CONFIG_AUFS_RDU is not set CONFIG_AUFS_SBILIST=y # CONFIG_AUFS_SHWH is not set +CONFIG_AUFS_XATTR=y CONFIG_AURORA_NB8800=m CONFIG_AUTOFS4_FS=m CONFIG_AUTO_ZRELADDR=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 0850972..053296f 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -44,7 +44,6 @@ CONFIG_ATA_OVER_ETH=m CONFIG_ATA_PIIX=y CONFIG_ATM=m # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set -# CONFIG_AUFS_XATTR is not set CONFIG_AUXDISPLAY=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 51a634b..7493f2e 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -31,7 +31,6 @@ CONFIG_ATA_PIIX=m CONFIG_ATH10K_AHB=y CONFIG_ATM=m # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set -# CONFIG_AUFS_XATTR is not set CONFIG_AUXDISPLAY=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BCH=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index ed814f1..fe0665b 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -40,7 +40,6 @@ CONFIG_ATA_PIIX=m CONFIG_ATH10K_AHB=y CONFIG_ATM=m # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set -# CONFIG_AUFS_XATTR is not set CONFIG_AUXDISPLAY=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 6397f99..ae97a7d 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -32,7 +32,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y # CONFIG_ATA_OVER_ETH is not set # CONFIG_ATM is not set # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set -CONFIG_AUFS_XATTR=y # CONFIG_AUXDISPLAY is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_BCM7XXX_PHY is not set
BugLink: http://bugs.launchpad.net/bugs/1557776 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- v2 - added annotations update. debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/s390x/config.common.s390x | 1 - 9 files changed, 2 insertions(+), 8 deletions(-)