Re: linux-next: manual merge of the tip tree with the crypto-current tree

2015-10-08 Thread Stephen Rothwell
Hi all, On Fri, 9 Oct 2015 12:47:00 +1100 Stephen Rothwell wrote: > > diff --cc arch/x86/crypto/camellia_aesni_avx_glue.c > index bacaa13acac5,12e729bfe71b.. > --- a/arch/x86/crypto/camellia_aesni_avx_glue.c > +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c > @@@ -554,12 -554,8

Re: linux-next: manual merge of the tip tree with the crypto-current tree

2015-10-08 Thread Ben Hutchings
On Fri, 2015-10-09 at 12:47 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/crypto/camellia_aesni_avx_glue.c > > between commit: > > 92b279070dd6 ("crypto: camellia_aesni_avx - Fix CPU feature checks") > > from the

linux-next: manual merge of the tip tree with the crypto-current tree

2015-10-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/crypto/camellia_aesni_avx_glue.c between commit: 92b279070dd6 ("crypto: camellia_aesni_avx - Fix CPU feature checks") from the crypto-current tree and commit: d91cab78133d ("x86/fpu: Rename XSAVE macros")

linux-next: manual merge of the tip tree with the crypto-current tree

2015-10-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/crypto/camellia_aesni_avx_glue.c between commit: 92b279070dd6 ("crypto: camellia_aesni_avx - Fix CPU feature checks") from the crypto-current tree and commit: d91cab78133d ("x86/fpu: Rename XSAVE macros")

Re: linux-next: manual merge of the tip tree with the crypto-current tree

2015-10-08 Thread Stephen Rothwell
Hi all, On Fri, 9 Oct 2015 12:47:00 +1100 Stephen Rothwell wrote: > > diff --cc arch/x86/crypto/camellia_aesni_avx_glue.c > index bacaa13acac5,12e729bfe71b.. > --- a/arch/x86/crypto/camellia_aesni_avx_glue.c > +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c >

Re: linux-next: manual merge of the tip tree with the crypto-current tree

2015-10-08 Thread Ben Hutchings
On Fri, 2015-10-09 at 12:47 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/crypto/camellia_aesni_avx_glue.c > > between commit: > > 92b279070dd6 ("crypto: camellia_aesni_avx - Fix CPU feature checks") > > from the