* linux-next: manual merge of the reset tree with the kspp-gustavo tree
@ 2020-08-19 0:28 Stephen Rothwell
2020-08-25 1:22 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-08-19 0:28 UTC (permalink / raw)
To: Philipp Zabel, Gustavo A. R. Silva
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Peng Fan
[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]
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;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the reset tree with the kspp-gustavo tree
2020-08-19 0:28 linux-next: manual merge of the reset tree with the kspp-gustavo tree Stephen Rothwell
@ 2020-08-25 1:22 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-08-25 1:22 UTC (permalink / raw)
To: Philipp Zabel
Cc: Gustavo A. R. Silva, Linux Next Mailing List,
Linux Kernel Mailing List, Peng Fan
[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]
Hi all,
On Wed, 19 Aug 2020 10:28:19 +1000 Stephen Rothwell <sfr@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-25 1:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-19 0:28 linux-next: manual merge of the reset tree with the kspp-gustavo tree Stephen Rothwell
2020-08-25 1:22 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox