From: Arnd Bergmann <arnd@arndb.de>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Olof Johansson <olof@lixom.net>,
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>,
Fabio Estevam <fabio.estevam@nxp.com>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the arm-soc tree
Date: Tue, 27 Mar 2018 09:59:43 +0200 [thread overview]
Message-ID: <CAK8P3a3QBmRBgaJg2n=DcwY7wJaB902Rk7h5kGd_WxqTVSTGog@mail.gmail.com> (raw)
In-Reply-To: <20180327075520.GA3245@dragon>
On Tue, Mar 27, 2018 at 9:55 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Tue, Mar 27, 2018 at 09:10:26AM +1100, Stephen Rothwell wrote:
>> Hi Shawn,
>>
>> Today's linux-next merge of the imx-mxs tree got a conflict in:
>>
>> arch/arm/configs/mxs_defconfig
>>
>> between commit:
>>
>> e3e583e7a293 ("ARM: mxs_defconfig: Re-sync defconfig")
>>
>> from the arm-soc tree and commit:
>>
>> 8bc2c29b550c ("ARM: mxs_defconfig: Re-sync defconfig")
>>
>> from the imx-mxs tree.
>>
>> I fixed it up (I just used the latter version) 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.
>
> Thanks, Stephen. We will sort this out on arm-soc tree.
>
> Arnd,
>
> You pulled "[GIT PULL 6/6] i.MX defconfig updates for 4.17" [1]?
> I thought you did not pull it, and updated it with v2 to address your
> comment. Let me know which one you want to send upstream. Thanks.
I also thought I had not pulled it, but it seems that I did: I definitely
pulled it in at first and then sent the email about it, planning to undo
the merge before pushing the branch to git.kernel.org.
The merge is currently at the top of the next/soc branch, so I'll undo
that and pull your new one instead.
Sorry about messing it up.
Arnd
next prev parent reply other threads:[~2018-03-27 7:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-26 22:10 linux-next: manual merge of the imx-mxs tree with the arm-soc tree Stephen Rothwell
2018-03-27 7:55 ` Shawn Guo
2018-03-27 7:59 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-05-06 0:43 Stephen Rothwell
2019-04-29 23:49 Stephen Rothwell
2017-10-30 11:58 Mark Brown
2015-06-01 0:54 Stephen Rothwell
2015-05-21 0:58 Stephen Rothwell
2015-01-13 0:16 Stephen Rothwell
2015-01-13 13:18 ` Arnd Bergmann
2015-01-13 20:29 ` Stephen Rothwell
2014-03-03 1:58 Stephen Rothwell
2014-02-20 0:42 Stephen Rothwell
2014-02-20 1:30 ` Shawn Guo
2014-01-05 23:42 Stephen Rothwell
2014-01-05 23:38 Stephen Rothwell
2013-06-19 6:24 Stephen Rothwell
2013-06-03 5:41 Stephen Rothwell
2013-04-10 7:33 Stephen Rothwell
2013-04-02 6:57 Stephen Rothwell
2013-04-02 6:55 Stephen Rothwell
2013-03-22 4:09 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='CAK8P3a3QBmRBgaJg2n=DcwY7wJaB902Rk7h5kGd_WxqTVSTGog@mail.gmail.com' \
--to=arnd@arndb.de \
--cc=fabio.estevam@nxp.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 \
--cc=shawn.guo@linaro.org \
/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).