Re: linux-next: bad merge in the libata tree
From: Tejun Heo
Date: Tue Jun 04 2013 - 22:51:33 EST
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
Thanks a lot.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/