Messages in this thread | | | Date | Mon, 24 Nov 2014 19:09:31 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the v4l-dvb tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/staging/media/omap24xx/omap24xxcam.c between commit db85a0403be4 ("[media] omap24xx/tcm825x: remove deprecated omap2 camera drivers") from the v4l-dvb tree and commits cfafe92c1e94 ("staging: media: omap24xx: Remove unnecessary 'out of memory' message") and 1d06bb4e9df3 ("staging: remove unneeded parentheses around the right hand side of an assignment") from the staging tree.
I fixed it up (the former removed the file, so I did that) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |