Re: linux-next: manual merge of the trivial tree with the net tree

[Jiri Kosina]

On Fri, 24 Sep 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/net/bnx2x/bnx2x_link.c between commit
> 62b29a5dd0930e0c956b6740f32d5b3bbaf20136 ("bnx2x: Adjust alignment of
> split PHY functions") from the net tree and commit
> 0b1974de66f9ed44f1423449628f4926bf95b854 ("Fix typo: configuation =>
> configuration") from the trivial tree.
> 
> The former removes the text updated by the latter, so I used the former.
> 
> Jiri, you might like to drop that hunk from the patch in your tree.

Done now, thanks for reporting.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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/