From: Tony Lindgren <tony@atomide•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linus Walleij <linus.walleij@linaro•org>,
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
Subject: Re: linux-next: manual merge of the gpio tree with the arm-soc tree
Date: Tue, 27 Sep 2016 12:16:54 -0700 [thread overview]
Message-ID: <20160927191653.57ig7mh3ptjy3izi@atomide.com> (raw)
In-Reply-To: <20160927150542.7e81e7ee@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> [160926 22:06]:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> arch/arm/mach-omap2/board-rx51-peripherals.c
>
> between commit:
>
> 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
>
> from the arm-soc tree and commit:
>
> 9132ce450bd1 ("ARM: omap2: fix missing include")
>
> from the gpio tree.
>
> I fixed it up (the former removed the file, so I did that) 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.
Yes thanks removing it the way to go.
Regards,
Tony
next prev parent reply other threads:[~2016-09-27 19:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 5:05 linux-next: manual merge of the gpio tree with the arm-soc tree Stephen Rothwell
2016-09-27 19:16 ` Tony Lindgren [this message]
2016-10-05 22:41 ` Stephen Rothwell
2016-10-06 6:52 ` Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2018-12-17 8:17 Stephen Rothwell
2018-12-17 19:40 ` Tony Lindgren
2014-07-29 8:19 Stephen Rothwell
2014-07-29 8:26 ` Thierry Reding
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=20160927191653.57ig7mh3ptjy3izi@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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