From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Philipp Zabel <p.zabel@pengutronix•de>,
"Gustavo A. R. Silva" <gustavo@embeddedor•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Peng Fan <peng.fan@nxp•com>
Subject: linux-next: manual merge of the reset tree with the kspp-gustavo tree
Date: Wed, 19 Aug 2020 10:28:19 +1000 [thread overview]
Message-ID: <20200819102819.63c9aa50@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2020-08-19 0:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-19 0:28 Stephen Rothwell [this message]
2020-08-25 1:22 ` linux-next: manual merge of the reset tree with the kspp-gustavo tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200819102819.63c9aa50@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gustavo@embeddedor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=p.zabel@pengutronix$(echo .)de \
--cc=peng.fan@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox