lkml.org 
[lkml]   [2013]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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


\
 
 \ /
  Last update: 2013-06-05 05:01    [W:0.040 / U:0.344 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site