Messages in this thread | | | Date | Mon, 9 Nov 2009 18:15:44 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the pcmcia tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/staging/comedi/drivers/cb_das16_cs.c between commit 4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi drivers") from the pcmcia tree and commit e18c724339a542aac71d1d47b0695bf7b4a5c3a3 ("STAGING: comedi: cb_das16_cs: fixing coding style errors") from the staging tree.
I fixed it up (using the pcmcia tree version when there is a clash) and can carry the fix as necessary.
[Greg, that staging tree commit has no SOB from its author ...] -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |