Re: linux-next: manual merge of the xilinx tree

2013-08-20 Thread Stephen Rothwell
Hi Michal, On Tue, 20 Aug 2013 12:58:32 +0200 Michal Simek wrote: > > Please remove this tree from the linux-next testing. > > xilinx git git://git.xilinx.com/linux-xlnx.git#arm-next Done. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpxpEGDqzFZw.pgp De

Re: linux-next: manual merge of the xilinx tree

2013-08-20 Thread Michal Simek
Hi Stephen, On 07/03/2013 08:02 AM, Stephen Rothwell wrote: > Hi Michal, > > On Wed, 03 Jul 2013 07:53:32 +0200 Michal Simek wrote: >> >> I have fixed it - it should be fixed there soon. > > Thanks. > >> But I am thinking about removing this tree from linux-next >> because we are pushing arm c

Re: linux-next: manual merge of the xilinx tree

2013-07-02 Thread Stephen Rothwell
Hi Michal, On Wed, 03 Jul 2013 07:53:32 +0200 Michal Simek wrote: > > I have fixed it - it should be fixed there soon. Thanks. > But I am thinking about removing this tree from linux-next > because we are pushing arm changes through arm-soc tree > and they require to have specific feature branc

Re: linux-next: manual merge of the xilinx tree

2013-07-02 Thread Michal Simek
Hi Stephen, On 07/03/2013 03:10 AM, Stephen Rothwell wrote: > Hi Michal, > > Today's linux-next merge of the xilinx tree got conflicts in several files. > > These conflicts are caused by a set of old patches in the xilinx tree > other copies of which have been merged upstream a while ago. I fac