Subject: linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 6 Nov 2020 11:19:17 +1100

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;