Messages in this thread | | | Date | Tue, 4 Jun 2013 19:51:04 -0700 | From | Tejun Heo <> | Subject | Re: linux-next: bad merge in the libata tree |
| |
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 fix patch from for-3.11 to for-3.10-fixes. My apologies. Fixed up. Should be okay now.
Thanks a lot.
-- tejun
| |