Messages in this thread | | | Date | Fri, 24 Sep 2010 12:19:24 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the net tree |
| |
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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |