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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20200825112251.042bfeb7@canb.auug.org.au>
Date:   Tue, 25 Aug 2020 11:22:51 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Philipp Zabel <p.zabel@...gutronix.de>
Cc:     "Gustavo A. R. Silva" <gustavo@...eddedor.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Peng Fan <peng.fan@....com>
Subject: Re: linux-next: manual merge of the reset tree with the
 kspp-gustavo tree

Hi all,

On Wed, 19 Aug 2020 10:28:19 +1000 Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped