From: Janusz Krzysztofik <jmkrzyszt@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Tony Lindgren <tony@atomide.com>
Subject: Re: linux-next: manual merge of the regulator tree with the arm-soc tree
Date: Wed, 30 May 2018 22:52:46 +0200 [thread overview]
Message-ID: <2022143.cJUAM8Fsdd@z50> (raw)
In-Reply-To: <20180530150711.2c7c1fe9@canb.auug.org.au>
On Wednesday, May 30, 2018 7:07:11 AM CEST Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the regulator tree got a conflict in:
>
> arch/arm/mach-omap1/board-ams-delta.c
>
> between commit:
>
> 0486738928bf ("ARM: OMAP1: ams-delta: add GPIO lookup tables")
>
> from the arm-soc tree and commit:
>
> 6059577cb28d ("regulator: fixed: Convert to use GPIO descriptor only")
>
> from the regulator tree.
>
> I fixed it up (see below - it may be better done) and can carry the fix
> as necessary.
Hi Stephen,
Your fix looks pretty good to me, but anyway, I will test it and confirm in a
day or two, as soon as I have access to the device.
Thanks,
Janusz
WARNING: multiple messages have this Message-ID (diff)
From: jmkrzyszt@gmail.com (Janusz Krzysztofik)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the regulator tree with the arm-soc tree
Date: Wed, 30 May 2018 22:52:46 +0200 [thread overview]
Message-ID: <2022143.cJUAM8Fsdd@z50> (raw)
In-Reply-To: <20180530150711.2c7c1fe9@canb.auug.org.au>
On Wednesday, May 30, 2018 7:07:11 AM CEST Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the regulator tree got a conflict in:
>
> arch/arm/mach-omap1/board-ams-delta.c
>
> between commit:
>
> 0486738928bf ("ARM: OMAP1: ams-delta: add GPIO lookup tables")
>
> from the arm-soc tree and commit:
>
> 6059577cb28d ("regulator: fixed: Convert to use GPIO descriptor only")
>
> from the regulator tree.
>
> I fixed it up (see below - it may be better done) and can carry the fix
> as necessary.
Hi Stephen,
Your fix looks pretty good to me, but anyway, I will test it and confirm in a
day or two, as soon as I have access to the device.
Thanks,
Janusz
next prev parent reply other threads:[~2018-05-30 20:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 5:07 linux-next: manual merge of the regulator tree with the arm-soc tree Stephen Rothwell
2018-05-30 5:07 ` Stephen Rothwell
2018-05-30 7:29 ` Linus Walleij
2018-05-30 7:29 ` Linus Walleij
2018-05-31 22:49 ` Janusz Krzysztofik
2018-05-31 22:49 ` Janusz Krzysztofik
2018-06-04 10:46 ` Mark Brown
2018-06-04 10:46 ` Mark Brown
2018-06-11 11:49 ` Linus Walleij
2018-06-11 11:49 ` Linus Walleij
2018-05-30 20:52 ` Janusz Krzysztofik [this message]
2018-05-30 20:52 ` Janusz Krzysztofik
-- strict thread matches above, loose matches on Subject: below --
2019-02-18 1:56 Stephen Rothwell
2019-02-18 1:56 ` Stephen Rothwell
2019-03-05 22:27 ` Stephen Rothwell
2019-03-05 22:27 ` 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=2022143.cJUAM8Fsdd@z50 \
--to=jmkrzyszt@gmail.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.