From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel•org>,
"Gustavo A. R. Silva" <gustavoars@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jacopo Mondi <jacopo+renesas@jmondi•org>
Subject: linux-next: manual merge of the v4l-dvb tree with the kspp-gustavo tree
Date: Wed, 19 Aug 2020 10:58:59 +1000 [thread overview]
Message-ID: <20200819105859.53cdcdf0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 790 bytes --]
Hi all,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
drivers/media/platform/pxa_camera.c
between commit:
58e813cceabd ("treewide: Use fallthrough pseudo-keyword")
from the kspp-gustavo tree and commit:
ebb965acddac ("media: pxa_camera: Use the new set_mbus_config op")
from the v4l-dvb tree.
I fixed it up (the latter removed the code updated by the former) 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 --]
reply other threads:[~2020-08-19 0:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200819105859.53cdcdf0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gustavoars@kernel$(echo .)org \
--cc=jacopo+renesas@jmondi$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@kernel$(echo .)org \
/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