Hi all,
On Wed, 19 Aug 2020 10:28:19 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.
>
> 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;
> }
This is now a conflict between the reset tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpE5NGyDAavD.pgp
Description: OpenPGP digital signature
