From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jonathan Corbet <corbet@lwn.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the jc_docs tree
Date: Thu, 1 Dec 2016 21:55:28 -0200 [thread overview]
Message-ID: <20161201215528.5027943c@vento.lan> (raw)
In-Reply-To: <20161202103107.01452535@canb.auug.org.au>
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
next prev parent reply other threads:[~2016-12-01 23:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 23:31 linux-next: manual merge of the v4l-dvb tree with the jc_docs tree Stephen Rothwell
2016-12-01 23:55 ` Mauro Carvalho Chehab [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-23 1:07 Stephen Rothwell
2025-01-28 0:49 ` Stephen Rothwell
2025-01-28 22:03 ` Jonathan Corbet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161201215528.5027943c@vento.lan \
--to=mchehab@osg.samsung.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.