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>
Subject: linux-next: manual merge of the v4l-dvb-next tree with the arm-soc tree
Date: Mon, 23 Jan 2023 10:09:23 +1100 [thread overview]
Message-ID: <20230123100923.7899a60f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 936 bytes --]
Hi all,
Today's linux-next merge of the v4l-dvb-next tree got conflicts in:
drivers/staging/media/Kconfig
drivers/staging/media/Makefile
between commit:
582603a95734 ("staging: media: remove davinci vpfe_capture driver")
from the arm-soc tree and commit:
d2a8e92f0b41 ("media: vpfe_capture: remove deprecated davinci drivers")
from the v4l-dvb-next tree.
These 2 commits removed the same driver but caused a conflict due to
other changes to these files.
I fixed it up (I just used the latter version of these 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-22 23:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-22 23:09 Stephen Rothwell [this message]
2023-01-23 9:13 ` linux-next: manual merge of the v4l-dvb-next tree with the arm-soc tree Arnd Bergmann
2023-01-23 9:25 ` Hans Verkuil
2023-02-15 22:29 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-02-08 22:45 Stephen Rothwell
2023-02-15 22:30 ` 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=20230123100923.7899a60f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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