linux-next: manual merge of the staging-next tree with the v4l-dvb tree

linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 625 bytes --]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/cx25821/cx25821-alsa.c between commit
4e0c923a0d23f86c7331b32bc2aeb280e10e029e ("V4L/DVB: Staging: cx25821: fix
coding style issues in cx25821-alsa.c") from the v4l-dvb tree and commit
98a178beaaf4c9a0acc4815807be51425b91f0a7 ("Staging: cx25821 fixed C99
comments, white spaces and unnecessary braces") from the staging-next
tree.

I used the v4l-dvb versions of the conflicting bits (they looked neater
to me).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Greg KH]

On Wed, Apr 28, 2010 at 04:07:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/cx25821/cx25821-alsa.c between commit
> 4e0c923a0d23f86c7331b32bc2aeb280e10e029e ("V4L/DVB: Staging: cx25821: fix
> coding style issues in cx25821-alsa.c") from the v4l-dvb tree and commit
> 98a178beaaf4c9a0acc4815807be51425b91f0a7 ("Staging: cx25821 fixed C99
> comments, white spaces and unnecessary braces") from the staging-next
> tree.
> 
> I used the v4l-dvb versions of the conflicting bits (they looked neater
> to me).

Odd, Mauro, why are you applying coding style fixes to the staging tree
to your tree?  I'll be glad to take them instead.

thanks,

greg k-h

Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Mauro Carvalho Chehab]

Greg KH wrote:
> On Wed, Apr 28, 2010 at 04:07:49PM +1000, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging-next tree got a conflict in
>> drivers/staging/cx25821/cx25821-alsa.c between commit
>> 4e0c923a0d23f86c7331b32bc2aeb280e10e029e ("V4L/DVB: Staging: cx25821: fix
>> coding style issues in cx25821-alsa.c") from the v4l-dvb tree and commit
>> 98a178beaaf4c9a0acc4815807be51425b91f0a7 ("Staging: cx25821 fixed C99
>> comments, white spaces and unnecessary braces") from the staging-next
>> tree.
>>
>> I used the v4l-dvb versions of the conflicting bits (they looked neater
>> to me).
> 
> Odd, Mauro, why are you applying coding style fixes to the staging tree
> to your tree?  I'll be glad to take them instead.

This driver (cx25821) came from my tree, so I was just keep maintaining it.
Although the driver works fine, it has some coding style issues, but the biggest
issue is that it has the same code that is almost identical replicated 8
times (one for each simultaneous stream that the device supports), and another
code duplicated 4 times (for the 4 simultaneous output streams).

Sorry, but I didn't realized that you're also retrieving patches for it. I think
I just assumed that we're following the same procedure as agreed with relation
to go7007 driver.

Anyway, the driver maintainer is now preparing a changeset that will hopefully 
solve the remaining issues that prevented it to be added directly on /drivers/media.

Cheers,
Mauro

linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/cx25821/cx25821-audups11.c between commit
e302c8255a198a567dab3a4ace7bd0222a6dc037 ("V4L/DVB: cx25821: Removed
duplicate code and cleaned up") from the v4l-dvb tree and commit
231ded903f2f30b2bcdbf6672c7197187e3bb1ee ("Staging: cx25821: added KERN_
facility levels") from the staging-next tree.

The former moved all te code in this file into other files, so I
effectively just dropped the usb patch by deleting this file.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Greg KH]

On Tue, Jul 06, 2010 at 05:53:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/cx25821/cx25821-audups11.c between commit
> e302c8255a198a567dab3a4ace7bd0222a6dc037 ("V4L/DVB: cx25821: Removed
> duplicate code and cleaned up") from the v4l-dvb tree and commit
> 231ded903f2f30b2bcdbf6672c7197187e3bb1ee ("Staging: cx25821: added KERN_
> facility levels") from the staging-next tree.
> 
> The former moved all te code in this file into other files, so I
> effectively just dropped the usb patch by deleting this file.

That sounds correct to me, thanks for doing this.

greg k-h

linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/Kconfig between commit
44d349d2b19019e0b5912bc4e6c8531e50b394aa ("V4L/DVB: staging/lirc: wire up
Kconfig and Makefile bits") from the v4l-dvb tree and several commits
from the staging-next tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/Kconfig
index 0e4122e,6796265..0000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -145,7 -149,13 +147,15 @@@ source "drivers/staging/mrst-touchscree
  
  source "drivers/staging/msm/Kconfig"
  
 +source "drivers/staging/lirc/Kconfig"
 +
+ source "drivers/staging/easycap/Kconfig"
+ 
+ source "drivers/staging/solo6x10/Kconfig"
+ 
+ source "drivers/staging/tidspbridge/Kconfig"
+ 
+ source "drivers/staging/quickstart/Kconfig"
+ 
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING

Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Greg KH]

On Wed, Jul 28, 2010 at 03:27:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/Kconfig between commit
> 44d349d2b19019e0b5912bc4e6c8531e50b394aa ("V4L/DVB: staging/lirc: wire up
> Kconfig and Makefile bits") from the v4l-dvb tree and several commits
> from the staging-next tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Looks good to me.

thanks,

greg k-h

linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

Hi Greg,

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

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/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Greg KH]

On Tue, Oct 19, 2010 at 05:23:31PM +1100, Stephen Rothwell wrote:
> 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.

Thanks for doing this, I appreciate it.

greg k-h

Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree

[Mauro Carvalho Chehab]

Em 19-10-2010 13:53, Greg KH escreveu:
> On Tue, Oct 19, 2010 at 05:23:31PM +1100, Stephen Rothwell wrote:
>> 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.
> 
> Thanks for doing this, I appreciate it.

Thanks, Stephen. I had to rebase my tree, in order to fix a merge conflict, and
remove two broken patches. You'll likely need to preserve this patch until both me
and Greg send our trees upstream.

Cheers,
Mauro