Subject: linux-next: manual merge of the reset tree with the kspp-gustavo tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 19 Aug 2020 10:28:19 +1000

Hi all,

Today's linux-next merge of the reset tree got a conflict in:

  drivers/reset/reset-imx7.c

between commit:

  58e813cceabd ("treewide: Use fallthrough pseudo-keyword")

from the kspp-gustavo tree and commit:

  2983e2385ff6 ("reset: imx7: add the cm4 reset for i.MX8MQ")

from the reset 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/reset/reset-imx7.c
index e8aa8691deb2,b60534a1e0ef..000000000000
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@@ -232,12 -235,13 +235,13 @@@ static int imx8mq_reset_set(struct rese
  		break;
  
  	case IMX8MQ_RESET_PCIE_CTRL_APPS_EN:
 -	case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:	/* fallthrough */
 -	case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:	/* fallthrough */
 -	case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N:	/* fallthrough */
 -	case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N:	/* fallthrough */
 -	case IMX8MQ_RESET_MIPI_DSI_RESET_N:	/* fallthrough */
 -	case IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N:	/* fallthrough */
 +	case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:
 +	case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:
 +	case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N:
 +	case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N:
 +	case IMX8MQ_RESET_MIPI_DSI_RESET_N:
 +	case IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N:
+ 	case IMX8MQ_RESET_M4_ENABLE:
  		value = assert ? 0 : bit;
  		break;
  	}