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

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

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in:

  drivers/media/v4l2-core/videobuf2-memops.c

between commit:

  6690c8c78c74 ("[media] media: vb2: Remove unused functions")

from the v4l-dvb tree and commit:

  e1c05067c323 ("treewide: fix typos in comment blocks")

from the trivial tree.

I fixed it up (the former removed the code modified by the latter)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

[Jiri Kosina]

On Wed, 29 Feb 2012, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/media/video/s5p-tv/hdmi_drv.c due to commit 382d19f197f9 ("media:
> Fix typo in mixer_drv.c and hdmi_drv.c") from the trivial tree also
> already existing in the v4l-dvb tree (same patch different commit) (and
> there are further changes in that tree to this file).
> 
> I just the used the version from the v4l-dvb tree.

Reverted now in my tree, thanks.

-- 
Jiri Kosina
SUSE Labs

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

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/s5p-tv/hdmi_drv.c due to commit 382d19f197f9 ("media:
Fix typo in mixer_drv.c and hdmi_drv.c") from the trivial tree also
already existing in the v4l-dvb tree (same patch different commit) (and
there are further changes in that tree to this file).

I just the used the version from the v4l-dvb tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/s5p-fimc/fimc-capture.c between commit 2319c539e39b
("[media] s5p-fimc: Remove sensor management code from FIMC capture
driver") from the v4l-dvb tree and commit 18df7b82e25c ("treewide:
Correct spelling of successfully in comments") from the trivial tree.

The former removed the code that the latter modified.
-- 
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 trivial tree with the v4l-dvb tree

[Jiri Kosina]

On Tue, 28 Dec 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/media/video/zoran/zoran.h between commit
> 8221f9b5fa3e08ba35378f08f2a606156e685916 ("[media] zoran: remove V4L1
> compat code and zoran custom ioctls") from the v4l-dvb tree and commit
> b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
> typos") from the trivial tree.
> 
> The former removed the code modified by the latter, so I used the former.

On Tue, 28 Dec 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/staging/stradis/stradis.c between commit
> aef01debdfad83ab71a83b7af8cd90203404c1aa ("[media] cpia, stradis: remove
> deprecated V4L1 drivers") from the v4l-dvb tree and commit
> b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
> typos") from the trivial tree.
> 
> The former removed the file modified by the latter, so I removed the file.

Hi Stephen,

I have dropped both hunks, so the conflict should be gone now.

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

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

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/staging/stradis/stradis.c between commit
aef01debdfad83ab71a83b7af8cd90203404c1aa ("[media] cpia, stradis: remove
deprecated V4L1 drivers") from the v4l-dvb tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial tree.

The former removed the file modified by the latter, so I removed the 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 --]

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

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/zoran/zoran.h between commit
8221f9b5fa3e08ba35378f08f2a606156e685916 ("[media] zoran: remove V4L1
compat code and zoran custom ioctls") from the v4l-dvb tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial tree.

The former removed the code modified by the latter, so I used the former.
-- 
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 trivial tree with the v4l-dvb tree

[Stephen Rothwell]

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

Hi Jiri,

On Sun, 11 Jul 2010 22:41:48 +0200 (CEST) Jiri Kosina <jkosina@suse.cz> wrote:
>
> thanks for reporting it, I have reverted the drivers/media/video/ov511.c 
> hunk.

Thanks.

-- 
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 trivial tree with the v4l-dvb tree

[Jiri Kosina]

On Tue, 6 Jul 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/media/video/ov511.c between commit
> b2bde15c455d09057dc7bd9f5b9ed67b9ac99b8a ("V4L/DVB: Remove obsolete ov511
> driver") from the v4l-dvb tree and commit
> 421f91d21ad6f799dc7b489bb33cc560ccc56f98 ("fix typos concerning "initiali
> [zs]e"") from the trivial tree.
> 
> The former just removes the file, so I removed it.

Hi Stephen,

thanks for reporting it, I have reverted the drivers/media/video/ov511.c 
hunk.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

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

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/ov511.c between commit
b2bde15c455d09057dc7bd9f5b9ed67b9ac99b8a ("V4L/DVB: Remove obsolete ov511
driver") from the v4l-dvb tree and commit
421f91d21ad6f799dc7b489bb33cc560ccc56f98 ("fix typos concerning "initiali
[zs]e"") from the trivial tree.

The former just removes the file, so I removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/cx18/cx18-mailbox.h between commit
368cb90a38d346d76cd32d882fbc620fc01e4102 ("V4L/DVB (13429): cx18: Add
Memory Descriptor List (MDL) layer to buffer handling") from the v4l-dvb
tree and commit 6070d81eb5f2d4943223c96e7609a53cdc984364 ("tree-wide: fix
misspelling of "definition" in comments") from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary.  It is very
trivial, though. :-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/media/video/cx18/cx18-mailbox.h
index 5ea0735,522ad53..0000000
--- a/drivers/media/video/cx18/cx18-mailbox.h
+++ b/drivers/media/video/cx18/cx18-mailbox.h
@@@ -39,9 -39,9 +39,9 @@@
  struct cx18;
  
  /*
 - * This structure is used by CPU to provide completed buffers information
 - * Its structure is dictrated by the layout of the SCB, required by the
 + * This structure is used by CPU to provide completed MDL & buffers information.
 + * Its structure is dictated by the layout of the SCB, required by the
-  * firmware, but its defintion needs to be here, instead of in cx18-scb.h,
+  * firmware, but its definition needs to be here, instead of in cx18-scb.h,
   * for mailbox work order scheduling
   */
  struct cx18_mdl_ack {

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