From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Daniel Mack <daniel@zonque.org>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Linus Walleij <linus.walleij@linaro.org>
Subject: Re: linux-next: manual merge of the regulator tree with the arm-soc tree
Date: Wed, 6 Mar 2019 09:27:14 +1100 [thread overview]
Message-ID: <20190306092714.23cf72d6@canb.auug.org.au> (raw)
In-Reply-To: <20190218125627.003fc22c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 984 bytes --]
Hi all,
On Mon, 18 Feb 2019 12:56:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the regulator tree got a conflict in:
>
> arch/arm/mach-pxa/raumfeld.c
>
> between commit:
>
> 0f884f8a090e ("ARM: pxa: remove raumfeld board files and defconfig")
>
> from the arm-soc tree and commit:
>
> 01dc79cd6fe7 ("regulator: fixed/gpio: Pull inversion/OD into gpiolib")
>
> from the regulator 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.
This is now a conflict between Linus' tree and the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-03-05 22:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-18 1:56 linux-next: manual merge of the regulator tree with the arm-soc tree Stephen Rothwell
2019-03-05 22:27 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-30 5:07 Stephen Rothwell
2018-05-30 7:29 ` Linus Walleij
2018-05-31 22:49 ` Janusz Krzysztofik
2018-06-04 10:46 ` Mark Brown
2018-06-11 11:49 ` Linus Walleij
2018-05-30 20:52 ` Janusz Krzysztofik
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=20190306092714.23cf72d6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=daniel@zonque.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=robert.jarzmik@free.fr \
/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).