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>,
ARM <linux-arm-kernel@lists.infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Amelie Delaunay <amelie.delaunay@st.com>,
Alexandre TORGUE <alexandre.torgue@st.com>,
Benjamin Gaignard <benjamin.gaignard@linaro.org>,
Fabrice GASNIER <fabrice.gasnier@st.com>
Subject: Re: linux-next: manual merge of the mfd tree with the arm-soc tree
Date: Tue, 24 Jan 2017 08:16:15 +0000 [thread overview]
Message-ID: <20170124081615.GQ16020@dell> (raw)
In-Reply-To: <20170124134319.2a6ba85d@canb.auug.org.au>
On Tue, 24 Jan 2017, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> arch/arm/boot/dts/stm32f429.dtsi
>
> between commits:
>
> 3604ef9c8154 ("ARM: dts: stm32: Add ADC support to stm32f429")
> dd3feb755a4a ("ARM: dts: stm32: Add RTC support for STM32F429 MCU")
>
> from the arm-soc tree and commit:
>
> 9072b6b2ba83 ("ARM: dts: stm32: add Timers driver for stm32f429 MCU")
>
> from the mfd tree.
An immutable branch as already been posted for this.
> 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.
>
next prev parent reply other threads:[~2017-01-24 8:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 2:43 linux-next: manual merge of the mfd tree with the arm-soc tree Stephen Rothwell
2017-01-24 8:16 ` Lee Jones [this message]
-- 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 9:18 ` Krzysztof Kozlowski
2022-03-23 0:58 ` Stephen Rothwell
2015-10-15 2:19 Stephen Rothwell
2015-10-15 2:23 ` Krzysztof Kozlowski
2015-10-15 8:04 ` 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=20170124081615.GQ16020@dell \
--to=lee.jones@linaro.org \
--cc=alexandre.torgue@st.com \
--cc=amelie.delaunay@st.com \
--cc=arnd@arndb.de \
--cc=benjamin.gaignard@linaro.org \
--cc=fabrice.gasnier@st.com \
--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 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).