From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Krzysztof Kozlowski <k.kozlowski.k@gmail.com>,
Kukjin Kim <kgene@kernel.org>
Subject: Re: linux-next: manual merge of the mfd tree with the arm-soc tree
Date: Thu, 15 Oct 2015 09:04:06 +0100 [thread overview]
Message-ID: <20151015080406.GL32409@x1> (raw)
In-Reply-To: <20151015131911.3b3a7ca8@canb.auug.org.au>
On Thu, 15 Oct 2015, Stephen Rothwell wrote:
> Hi Lee,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> Documentation/devicetree/bindings/mfd/s2mps11.txt
>
> between commit:
>
> 6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
>
> from the arm-soc tree and commit:
>
> db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X")
>
> from the mfd tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Yeah, I thought this might happen.
Hence: http://www.spinics.net/lists/devicetree/msg97548.html.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
WARNING: multiple messages have this Message-ID (diff)
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the mfd tree with the arm-soc tree
Date: Thu, 15 Oct 2015 09:04:06 +0100 [thread overview]
Message-ID: <20151015080406.GL32409@x1> (raw)
In-Reply-To: <20151015131911.3b3a7ca8@canb.auug.org.au>
On Thu, 15 Oct 2015, Stephen Rothwell wrote:
> Hi Lee,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> Documentation/devicetree/bindings/mfd/s2mps11.txt
>
> between commit:
>
> 6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
>
> from the arm-soc tree and commit:
>
> db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X")
>
> from the mfd tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Yeah, I thought this might happen.
Hence: http://www.spinics.net/lists/devicetree/msg97548.html.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2015-10-15 8:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 2:19 linux-next: manual merge of the mfd tree with the arm-soc tree Stephen Rothwell
2015-10-15 2:19 ` Stephen Rothwell
2015-10-15 2:19 ` Stephen Rothwell
2015-10-15 2:23 ` Krzysztof Kozlowski
2015-10-15 2:23 ` Krzysztof Kozlowski
2015-10-15 8:04 ` Lee Jones [this message]
2015-10-15 8:04 ` Lee Jones
-- strict thread matches above, loose matches on Subject: below --
2025-07-25 1:30 Stephen Rothwell
2022-03-09 2:29 Stephen Rothwell
2022-03-09 2:29 ` Stephen Rothwell
2022-03-09 9:18 ` Krzysztof Kozlowski
2022-03-09 9:18 ` Krzysztof Kozlowski
2022-03-23 0:58 ` Stephen Rothwell
2022-03-23 0:58 ` Stephen Rothwell
2017-01-24 2:43 Stephen Rothwell
2017-01-24 2:43 ` Stephen Rothwell
2017-01-24 8:16 ` Lee Jones
2017-01-24 8:16 ` Lee Jones
2011-11-01 5:19 Stephen Rothwell
2011-10-11 5:41 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=20151015080406.GL32409@x1 \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=k.kozlowski.k@gmail.com \
--cc=kgene@kernel.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 \
/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.