Re: linux-next: manual merge of the arm64 tree with the arm-soc tree

2015-04-07 Thread Catalin Marinas
Hi Stephen, On Tue, Apr 07, 2015 at 11:46:00AM +1000, Stephen Rothwell wrote: > diff --cc arch/arm64/configs/defconfig > index 96bba367f80c,e07896c819ef.. > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@@ -31,10 -31,12 +31,14 @@@ CONFIG_MODULES= > CONFIG

Re: linux-next: manual merge of the arm64 tree with the arm-soc tree

2015-03-31 Thread Catalin Marinas
Hi Stephen, On Tue, Mar 31, 2015 at 10:21:22AM +1100, Stephen Rothwell wrote: > diff --cc arch/arm64/configs/defconfig > index f3c8619f8fe1,e07896c819ef.. > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@@ -31,9 -31,12 +31,13 @@@ CONFIG_MODULES= > CONFIG_