Messages in this thread | | | Date | Thu, 16 Sep 2010 12:31:52 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pcmcia tree with the net tree |
| |
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in drivers/net/pcmcia/pcnet_cs.c between commit 7136e11e0cf520ab3fc7b55a20e60c2ec5ea88e1 ("pcnet_cs: Use pr_fmt and pr_<level>") from the net tree and commit b76dc0546709aef18f123847680108c2fd33f203 ("pcmcia pcnet_cs: try setting io_lines to 16 if card setup fails") from the pcmcia tree.
The latter used dev_notice/info (and moved the code) where the former used pr_notice, so I used the latter. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |