Messages in this thread |  | | Date | Fri, 4 Dec 2009 14:53:40 +1100 | | 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/xirc2ps_cs.c between commit 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc ("drivers/net: Move && and || to end of previous line") from the net tree and commit dddfbd824b96a25da0b2f1cf35c0be33ef2422fe ("pcmcia: convert net pcmcia drivers to use new CIS helpers") from the pcmcia tree.
I fixed it up (by using the pcmcia tree version - since that removed the conflicting code that was modified in the net tree commit) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] |  |