Messages in this thread | | | Date | Tue, 19 Oct 2010 17:23:31 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree |
| |
Hi Greg,
On Tue, 19 Oct 2010 17:12:33 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the staging-next tree got a conflict in > drivers/staging/cx25821/cx25821-audio-upstream.c between commit > d6a0215fc954bd16a21bad94a3292f080d9f6f04 ("[media] Staging: cx25821: fix > braces and space coding style issues") from the v4l-dvb tree and commit > bb59a4c539140592723e806e852ee171da0eb3eb ("Staging: cx25821: clenup > warnings found by checkpatch.pl tool in cx25821-audio-upstream.c and > cx25821-audio.h") from the staging-next tree. > > Basically different versions of the same patch. I fixed it up.
Fixed conflicts in drivers/staging/cx25821/cx25821-audio.h as well. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |