From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Jernej Skrabec <jernej.skrabec@siol.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Martin Cerveny <m.cerveny@computer.org>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Maxime Ripard <maxime@cerno.tech>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Tue, 15 Dec 2020 07:30:37 +1100 [thread overview]
Message-ID: <20201215073037.5bb96437@canb.auug.org.au> (raw)
In-Reply-To: <20201208110413.04400395@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1731 bytes --]
Hi all,
On Tue, 8 Dec 2020 11:04:13 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
>
> drivers/staging/media/sunxi/cedrus/cedrus.c
>
> between commit:
>
> c6e95daab1cc ("media: cedrus: Remove the MBUS quirks")
>
> from the arm-soc tree and commits:
>
> 503dab0b8a56 ("media: cedrus: Register all codecs as capability")
> 68b4a01f88af ("media: cedrus: Make VP8 codec as capability")
>
> from the v4l-dvb tree.
>
> I fixed it up (see below) 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
>
> diff --cc drivers/staging/media/sunxi/cedrus/cedrus.c
> index d5fca10ea5b4,18d54f9fd715..000000000000
> --- a/drivers/staging/media/sunxi/cedrus/cedrus.c
> +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
> @@@ -522,7 -584,11 +584,10 @@@ static const struct cedrus_variant sun5
>
> static const struct cedrus_variant sun50i_h6_cedrus_variant = {
> .capabilities = CEDRUS_CAPABILITY_UNTILED |
> - CEDRUS_CAPABILITY_H265_DEC,
> + CEDRUS_CAPABILITY_MPEG2_DEC |
> + CEDRUS_CAPABILITY_H264_DEC |
> + CEDRUS_CAPABILITY_H265_DEC |
> + CEDRUS_CAPABILITY_VP8_DEC,
> - .quirks = CEDRUS_QUIRK_NO_DMA_OFFSET,
> .mod_rate = 600000000,
> };
>
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-12-14 20:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 0:04 linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Stephen Rothwell
2020-12-14 20:30 ` Stephen Rothwell [this message]
2020-12-14 21:05 ` Mauro Carvalho Chehab
-- strict thread matches above, loose matches on Subject: below --
2017-08-22 0:55 Stephen Rothwell
2017-09-04 5:23 ` Stephen Rothwell
2015-12-02 13:36 Mark Brown
2014-12-05 3:03 Stephen Rothwell
2014-12-01 2:52 Stephen Rothwell
2014-11-24 2:22 Stephen Rothwell
2014-11-24 15:28 ` Tony Lindgren
2012-01-11 2:31 Stephen Rothwell
2012-01-11 5:08 ` Olof Johansson
2012-01-11 8:36 ` Guennadi Liakhovetski
2012-01-11 10:35 ` Mauro Carvalho Chehab
2012-01-11 14:50 ` Arnd Bergmann
2012-01-11 15:09 ` Olof Johansson
2012-01-11 15:57 ` Nicolas Ferre
2012-01-11 16:44 ` Olof Johansson
2012-01-11 20:47 ` Mauro Carvalho Chehab
2012-01-11 16:46 ` Arnd Bergmann
2012-01-11 16:58 ` Olof Johansson
2012-01-11 17:56 ` Guennadi Liakhovetski
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=20201215073037.5bb96437@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jernej.skrabec@siol.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.cerveny@computer.org \
--cc=maxime@cerno.tech \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
--cc=olof@lixom.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).