From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel•org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all•nl>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+huawei@kernel•org>,
Randy Dunlap <rdunlap@infradead•org>,
YueHaibing <yuehaibing@huawei•com>
Subject: linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree
Date: Fri, 6 Nov 2020 11:19:17 +1100 [thread overview]
Message-ID: <20201106111917.2d62e74b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1382 bytes --]
Hi all,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
drivers/media/platform/marvell-ccic/mmp-driver.c
between commit:
e6fcf468c51d ("media: media/platform/marvell-ccic: fix warnings when CONFIG_PM is not enabled")
from the v4l-dvb-fixes tree and commit:
009e3b8d9e28 ("media: marvell-ccic: Fix -Wunused-function warnings")
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/media/platform/marvell-ccic/mmp-driver.c
index 63fce1b85d26,032fdddbbecc..000000000000
--- a/drivers/media/platform/marvell-ccic/mmp-driver.c
+++ b/drivers/media/platform/marvell-ccic/mmp-driver.c
@@@ -307,8 -307,7 +307,8 @@@ static int mmpcam_platform_remove(struc
* Suspend/resume support.
*/
+#ifdef CONFIG_PM
- static int mmpcam_runtime_resume(struct device *dev)
+ static int __maybe_unused mmpcam_runtime_resume(struct device *dev)
{
struct mmp_camera *cam = dev_get_drvdata(dev);
struct mcam_camera *mcam = &cam->mcam;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-11-06 0:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 0:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-27 12:34 linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree broonie
2020-01-09 0:10 Stephen Rothwell
2020-01-09 7:05 ` Mauro Carvalho Chehab
2017-06-05 2:03 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=20201106111917.2d62e74b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+huawei@kernel$(echo .)org \
--cc=mchehab@kernel$(echo .)org \
--cc=rdunlap@infradead$(echo .)org \
--cc=yuehaibing@huawei$(echo .)com \
/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