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>
Cc: ARM <linux-arm-kernel@lists•infradead.org>,
"Hans Verkuil" <hverkuil-cisco@xs4all•nl>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>
Subject: Re: linux-next: manual merge of the v4l-dvb-next tree with the arm-soc tree
Date: Thu, 16 Feb 2023 09:30:33 +1100 [thread overview]
Message-ID: <20230216093033.111304fa@canb.auug.org.au> (raw)
In-Reply-To: <20230209094548.44b29fd5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
Hi all,
On Thu, 9 Feb 2023 09:45:48 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb-next tree got conflicts in:
>
> drivers/media/platform/ti/davinci/vpbe_display.c
> drivers/media/platform/ti/davinci/vpbe_osd.c
> drivers/media/platform/ti/davinci/vpbe_venc.c
>
> between commit:
>
> eeee69739353 ("media: davinci: remove vpbe support")
>
> from the arm-soc tree and commits:
>
> eb78ca6a0496 ("media: ti/davinci: vpbe_osd: Drop empty platform remove function")
> 5204a5dce04b ("media: ti/davinci: vpbe_venc: Drop empty platform remove function")
> 0d3732fb1b20 ("media: ti: davinci: vpbe_display.c: return 0 instead of 'ret'.")
>
> from the v4l-dvb-next tree.
>
> I fixed it up (I removed the files) 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 arm-soc tree and the v4l-dvb tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-02-15 22:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-08 22:45 linux-next: manual merge of the v4l-dvb-next tree with the arm-soc tree Stephen Rothwell
2023-02-15 22:30 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-22 23:09 Stephen Rothwell
2023-01-23 9:13 ` Arnd Bergmann
2023-01-23 9:25 ` Hans Verkuil
2023-02-15 22:29 ` Stephen Rothwell
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=20230216093033.111304fa@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@kernel$(echo .)org \
--cc=olof@lixom$(echo .)net \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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