From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>,
Haibo Chen <haibo.chen@nxp.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Peng Fan <peng.fan@nxp.com>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree
Date: Thu, 19 Oct 2023 10:41:01 +0200 [thread overview]
Message-ID: <CACMJSev3=yB8nziqxFgdZUSqdpv+ZjLQepZTopJOcfJ0NoGR8w@mail.gmail.com> (raw)
In-Reply-To: <20231019160616.55eac2b8@canb.auug.org.au>
On Thu, 19 Oct 2023 at 07:06, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> drivers/gpio/gpio-vf610.c
>
> between commit:
>
> fc363413ef8e ("gpio: vf610: set value before the direction to avoid a glitch")
>
> from the gpio-brgl-fixes tree and commit:
>
> b57587f11f81 ("gpio: vf610: simplify code by dropping data check")
>
> from the gpio-brgl 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/gpio/gpio-vf610.c
> index 656d6b1dddb5,a89ae84a1fa0..000000000000
> --- a/drivers/gpio/gpio-vf610.c
> +++ b/drivers/gpio/gpio-vf610.c
> @@@ -126,9 -140,7 +140,9 @@@ static int vf610_gpio_direction_output(
> unsigned long mask = BIT(gpio);
> u32 val;
>
> + vf610_gpio_set(chip, gpio, value);
> +
> - if (port->sdata && port->sdata->have_paddr) {
> + if (port->sdata->have_paddr) {
> val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
> val |= mask;
> vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
Thanks Stephen, this is correct.
My for-next tree is currently rebased on top of v6.6-rc1 while the
fixes tree tracks Linus' master.
Once the fixes are upstream, I may just rebase my for-next tree.
Bart
next prev parent reply other threads:[~2023-10-19 8:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 5:06 linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree Stephen Rothwell
2023-10-19 8:41 ` Bartosz Golaszewski [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-10 5:32 Stephen Rothwell
2024-05-10 6:33 ` Bartosz Golaszewski
2024-05-10 7:08 ` Stephen Rothwell
2024-05-10 7:10 ` Stephen Rothwell
2024-05-10 15:08 ` Andy Shevchenko
2021-01-20 2:51 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='CACMJSev3=yB8nziqxFgdZUSqdpv+ZjLQepZTopJOcfJ0NoGR8w@mail.gmail.com' \
--to=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=haibo.chen@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peng.fan@nxp.com \
--cc=sfr@canb.auug.org.au \
/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).