On Wed, 4 Feb 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> include/linux/libata.h between commit
> 9062712fa9ed13b531dfc2228086650b8bd6a255 ("libata: implement
> HORKAGE_1_5_GBPS and apply it to WD My Book") from the libata tree tree
> and commit 71e75a63456e0bb39afcae3c28dd5e211fb2b637 ("trivial: Fix
> misspelling of firmware") from the trivial tree.
> Juts trivial context overlap. I fixed it up (see below) and can carry
> the fix as necessary.
Thanks. As the libata patch is apparently now in Linus' tree, I have now
resolved this conflict in my tree, so you should be able to drop this
fixup in the next round of linux-next merging.
Thanks,
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
