Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1534558

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

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the v4l-dvb tree with the jc_docs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-12-02 00:40 +0100
  Re: linux-next: manual merge of the v4l-dvb tree with the jc_docs  tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-12-02 01:10 +0100

csiph-web