Re: linux-next: bad merge in the libata tree

2013-06-04 Thread Tejun Heo
On Wed, Jun 05, 2013 at 10:13:39AM +1000, Stephen Rothwell wrote: > Hi Tejun, > > The top commit of the libata tree is a merge that leaves some conflict > markers in drivers/ata/sata_rcar.c ... > > I will use yesterday's tree for today. Sorry, I messed up while moving a sata_rcar build warning f

linux-next: bad merge in the libata tree

2013-06-04 Thread Stephen Rothwell
Hi Tejun, The top commit of the libata tree is a merge that leaves some conflict markers in drivers/ata/sata_rcar.c ... I will use yesterday's tree for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpJrFy3_8aez.pgp Description: PGP signature