linux-next: bad merge in the libata tree

From: Stephen Rothwell
Date: Tue Jun 04 2013 - 20:14:00 EST

Next message: Ben Hutchings: "Re: [PATCH] sctp: set association state to established in dupcook_ahandler"
Previous message: Arve Hjønnevåg: "Re: [PATCH v4 2/6] staging: android: binder: fix binder interface for64bit compat layer"
Next in thread: Tejun Heo: "Re: linux-next: bad merge in the libata tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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 Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Ben Hutchings: "Re: [PATCH] sctp: set association state to established in dupcook_ahandler"
Previous message: Arve Hjønnevåg: "Re: [PATCH v4 2/6] staging: android: binder: fix binder interface for64bit compat layer"
Next in thread: Tejun Heo: "Re: linux-next: bad merge in the libata tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]