Message ID | 1398865912-117524-1-git-send-email-tim.gardner@canonical.com |
---|---|
State | New |
Headers | show |
On 04/30/2014 07:51 AM, Tim Gardner wrote: > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > .../abi/3.13.0-25.47/ppc64el/generic.modules | 2 -- > debian.master/config/config.common.ubuntu | 2 +- > debian.master/config/powerpc/config.common.powerpc | 2 +- > debian.master/config/ppc64el/config.common.ppc64el | 2 +- > 4 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules b/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules > index 96a13f4..a73d256 100644 > --- a/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules > +++ b/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules > @@ -9,7 +9,6 @@ > 8139too > 8250_dw > 8390 > -842 > 88pm800 > 88pm805 > 88pm80x > @@ -1774,7 +1773,6 @@ n_tracesink > null_blk > nvidiafb > nvme > -nx-crypto > nxt200x > nxt6000 > objlayoutdriver > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index d0251ca..416760d 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -1325,7 +1325,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m > CONFIG_CRYPTO_DEV_GEODE=m > CONFIG_CRYPTO_DEV_HIFN_795X=m > CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y > -CONFIG_CRYPTO_DEV_NX=y > +CONFIG_CRYPTO_DEV_NX_COMPRESS=m > CONFIG_CRYPTO_DEV_NX_ENCRYPT=m > CONFIG_CRYPTO_DEV_OMAP_AES=m > CONFIG_CRYPTO_DEV_OMAP_SHAM=m > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index b6b959b..4e0bd20 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -25,7 +25,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y > CONFIG_CPU_IDLE=y > # CONFIG_CPU_LITTLE_ENDIAN is not set > # CONFIG_CRASH_DUMP is not set > -CONFIG_CRYPTO_DEV_NX_COMPRESS=m > +CONFIG_CRYPTO_DEV_NX=y > # CONFIG_DEBUG_MEMORY_INIT is not set > # CONFIG_DEFAULT_CFQ is not set > CONFIG_DEFAULT_DEADLINE=y > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index 92159cc..a0f163c 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -24,7 +24,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_IDLE=y > CONFIG_CPU_LITTLE_ENDIAN=y > CONFIG_CRASH_DUMP=y > -CONFIG_CRYPTO_DEV_NX_COMPRESS=y > +# CONFIG_CRYPTO_DEV_NX is not set > CONFIG_DEBUG_MEMORY_INIT=y > CONFIG_DEFAULT_CFQ=y > # CONFIG_DEFAULT_DEADLINE is not set > http://bugs.launchpad.net/bugs/1314625
On Wed, Apr 30, 2014 at 07:51:52AM -0600, Tim Gardner wrote: > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > .../abi/3.13.0-25.47/ppc64el/generic.modules | 2 -- > debian.master/config/config.common.ubuntu | 2 +- > debian.master/config/powerpc/config.common.powerpc | 2 +- > debian.master/config/ppc64el/config.common.ppc64el | 2 +- > 4 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules b/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules > index 96a13f4..a73d256 100644 > --- a/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules > +++ b/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules > @@ -9,7 +9,6 @@ > 8139too > 8250_dw > 8390 > -842 > 88pm800 > 88pm805 > 88pm80x > @@ -1774,7 +1773,6 @@ n_tracesink > null_blk > nvidiafb > nvme > -nx-crypto > nxt200x > nxt6000 > objlayoutdriver > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index d0251ca..416760d 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -1325,7 +1325,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m > CONFIG_CRYPTO_DEV_GEODE=m > CONFIG_CRYPTO_DEV_HIFN_795X=m > CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y > -CONFIG_CRYPTO_DEV_NX=y > +CONFIG_CRYPTO_DEV_NX_COMPRESS=m > CONFIG_CRYPTO_DEV_NX_ENCRYPT=m > CONFIG_CRYPTO_DEV_OMAP_AES=m > CONFIG_CRYPTO_DEV_OMAP_SHAM=m > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index b6b959b..4e0bd20 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -25,7 +25,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y > CONFIG_CPU_IDLE=y > # CONFIG_CPU_LITTLE_ENDIAN is not set > # CONFIG_CRASH_DUMP is not set > -CONFIG_CRYPTO_DEV_NX_COMPRESS=m > +CONFIG_CRYPTO_DEV_NX=y > # CONFIG_DEBUG_MEMORY_INIT is not set > # CONFIG_DEFAULT_CFQ is not set > CONFIG_DEFAULT_DEADLINE=y > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index 92159cc..a0f163c 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -24,7 +24,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > CONFIG_CPU_IDLE=y > CONFIG_CPU_LITTLE_ENDIAN=y > CONFIG_CRASH_DUMP=y > -CONFIG_CRYPTO_DEV_NX_COMPRESS=y > +# CONFIG_CRYPTO_DEV_NX is not set > CONFIG_DEBUG_MEMORY_INIT=y > CONFIG_DEFAULT_CFQ=y > # CONFIG_DEFAULT_DEADLINE is not set > -- > 1.7.9.5 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Including an IRC ACK from bjf.
diff --git a/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules b/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules index 96a13f4..a73d256 100644 --- a/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules +++ b/debian.master/abi/3.13.0-25.47/ppc64el/generic.modules @@ -9,7 +9,6 @@ 8139too 8250_dw 8390 -842 88pm800 88pm805 88pm80x @@ -1774,7 +1773,6 @@ n_tracesink null_blk nvidiafb nvme -nx-crypto nxt200x nxt6000 objlayoutdriver diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d0251ca..416760d 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1325,7 +1325,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y -CONFIG_CRYPTO_DEV_NX=y +CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_ENCRYPT=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_CRYPTO_DEV_OMAP_SHAM=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index b6b959b..4e0bd20 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -25,7 +25,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y CONFIG_CPU_IDLE=y # CONFIG_CPU_LITTLE_ENDIAN is not set # CONFIG_CRASH_DUMP is not set -CONFIG_CRYPTO_DEV_NX_COMPRESS=m +CONFIG_CRYPTO_DEV_NX=y # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_DEADLINE=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 92159cc..a0f163c 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -24,7 +24,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_IDLE=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CRASH_DUMP=y -CONFIG_CRYPTO_DEV_NX_COMPRESS=y +# CONFIG_CRYPTO_DEV_NX is not set CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set
Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- .../abi/3.13.0-25.47/ppc64el/generic.modules | 2 -- debian.master/config/config.common.ubuntu | 2 +- debian.master/config/powerpc/config.common.powerpc | 2 +- debian.master/config/ppc64el/config.common.ppc64el | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-)