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

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got conflicts in:

  Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg
  Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg
  Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg

between commit:

  15a04d4e76bd ("docs-rst: auto-generate PDF image files")

from the jc_docs tree and commit:

  9e3d073009d2 ("[media] docs-rst: cleanup SVG files")

from the v4l-dvb tree.

I fixed it up (I have no idea, so I just deleted the files as the former
did.  Or were they moved?) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

[Mauro Carvalho Chehab]

Em Fri, 2 Dec 2016 10:31:07 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got conflicts in:
> 
>   Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg
>   Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg
>   Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
> 
> between commit:
> 
>   15a04d4e76bd ("docs-rst: auto-generate PDF image files")
> 
> from the jc_docs tree and commit:
> 
>   9e3d073009d2 ("[media] docs-rst: cleanup SVG files")
> 
> from the v4l-dvb tree.
> 
> I fixed it up (I have no idea, so I just deleted the files as the former
> did.  Or were they moved?) and can carry the fix as necessary. 

Those files were moved at the docs-next tree. I did some further
cleanups on them, in order to reduce their size.

> This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I'll pull from Jon's tree and solve such conflicts. Thanks for pointing
it!


-- 
Thanks,
Mauro

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/admin-guide/media/ipu3.rst

between commit:

  3961fba7e1e9 ("media: ipu3.rst: Prune unreferenced footnotes")

from the jc_docs tree and commit:

  688c0a6907a7 ("media: Documentation: ipu3: Remove unused and obsolete references")

from the v4l-dvb tree.

I fixed it up (I just used the former - it added one more line) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi all,

On Thu, 23 Jan 2025 12:07:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   Documentation/admin-guide/media/ipu3.rst
> 
> between commit:
> 
>   3961fba7e1e9 ("media: ipu3.rst: Prune unreferenced footnotes")
> 
> from the jc_docs tree and commit:
> 
>   688c0a6907a7 ("media: Documentation: ipu3: Remove unused and obsolete references")
> 
> from the v4l-dvb tree.
> 
> I fixed it up (I just used the former - it added one more line) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

This is now a conflict between the jc_docs tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Jonathan Corbet]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> On Thu, 23 Jan 2025 12:07:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the v4l-dvb tree got a conflict in:
>> 
>>   Documentation/admin-guide/media/ipu3.rst
>> 
>> between commit:
>> 
>>   3961fba7e1e9 ("media: ipu3.rst: Prune unreferenced footnotes")
>> 
>> from the jc_docs tree and commit:
>> 
>>   688c0a6907a7 ("media: Documentation: ipu3: Remove unused and obsolete references")
>> 
>> from the v4l-dvb tree.
>> 
>> I fixed it up (I just used the former - it added one more line) and can
>> carry the fix as necessary. This is now fixed as far as linux-next is
>> concerned, but any non trivial conflicts should be mentioned to your
>> upstream maintainer when your tree is submitted for merging.  You may
>> also want to consider cooperating with the maintainer of the conflicting
>> tree to minimise any particularly complex conflicts.
>
> This is now a conflict between the jc_docs tree and Linus' tree.

I'll just drop the offending patch on this side - its objective has been
achieved.

Thanks,

jon