lkml.org 
[lkml]   [2016]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the v4l-dvb tree with the jc_docs tree
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

\
 
 \ /
  Last update: 2016-12-02 01:04    [W:0.042 / U:0.488 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site