From: Shawn Guo <shawnguo@kernel.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org,
Sascha Hauer <s.hauer@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
NXP Linux Team <linux-imx@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>
Subject: Re: [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration
Date: Tue, 18 Jul 2023 08:05:49 +0800 [thread overview]
Message-ID: <20230718000549.GN9559@dragon> (raw)
In-Reply-To: <20230717070350.zy466pzqcfqpexas@pengutronix.de>
On Mon, Jul 17, 2023 at 09:03:50AM +0200, Uwe Kleine-König wrote:
> Hello Shawn,
>
> On Mon, Jul 17, 2023 at 09:06:52AM +0800, Shawn Guo wrote:
> > On Thu, Jun 15, 2023 at 11:41:00AM +0200, Uwe Kleine-König wrote:
> > > Instead of using 0x80000000 explicitly specify the reset defaults for
> > > the pad settings. This way the pad configuration is explicit and so
> > > isn't affected by changes that might have been done in the bootloader.
> > >
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > > ---
> > > arch/arm/boot/dts/imx25-karo-tx25.dts | 50 +++++++++++++--------------
> > > 1 file changed, 25 insertions(+), 25 deletions(-)
> >
> > It doesn't apply any more. Could you rebase and resend?
>
> when using git am -3 to apply, it works fine for me on top of
> next-20230717 and v6.5-rc2.
Ah, I completely forgot about 3-way merge parameter :)
Applied, thanks!
Shawn
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2023-07-19 6:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 9:41 [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration Uwe Kleine-König
2023-06-15 10:01 ` Uwe Kleine-König
2023-07-17 1:06 ` Shawn Guo
2023-07-17 7:03 ` Uwe Kleine-König
2023-07-18 0:05 ` Shawn Guo [this message]
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=20230718000549.GN9559@dragon \
--to=shawnguo@kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=s.hauer@pengutronix.de \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).