linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
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 Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Viresh Kumar <viresh.kumar@linaro.org>,
	Maxime Ripard <maxime.ripard@free-electrons.com>,
	Quentin Schulz <quentin.schulz@free-electrons.com>
Subject: Re: linux-next: manual merge of the pm tree with the arm-soc tree
Date: Thu, 20 Apr 2017 02:38:10 +0200	[thread overview]
Message-ID: <4444301.nE19g0hn7H@aspire.rjw.lan> (raw)
In-Reply-To: <20170420103427.62fbf195@canb.auug.org.au>

On Thursday, April 20, 2017 10:34:27 AM Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   arch/arm/boot/dts/sun8i-a33.dtsi
> 
> between commits:
> 
>   66c373228dc4 ("ARM: sun8i: a33: Add the Mali OPPs")
>   e6bd37627e92 ("ARM: sun8i: a33: add all operating points")
> 
> from the arm-soc tree and commit:
> 
>   d87bd1942058 ("PM / OPP: Use - instead of @ for DT entries")
> 
> from the pm tree.

Thanks for the report!

I'm going to drop the conflicting commit tomorrow.

Thanks,
Rafael

  reply	other threads:[~2017-04-20  0:44 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-20  0:34 linux-next: manual merge of the pm tree with the arm-soc tree Stephen Rothwell
2017-04-20  0:38 ` Rafael J. Wysocki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-10-21  0:00 Stephen Rothwell
2017-04-21  0:54 Stephen Rothwell
2017-04-21  5:53 ` Arnd Bergmann
2017-04-21  6:39   ` santosh.shilimkar
2017-04-21  9:31     ` Arnd Bergmann
2017-04-21 21:02       ` santosh.shilimkar
2017-04-21 21:31         ` Rafael J. Wysocki
2017-04-21 21:50           ` Santosh Shilimkar
2017-04-21 21:44         ` Arnd Bergmann
2017-04-21 21:54           ` Santosh Shilimkar
2017-04-24 18:02             ` Dave Gerlach
2017-04-24 18:22               ` Santosh Shilimkar
2017-04-21  0:50 Stephen Rothwell
2016-04-29  1:18 Stephen Rothwell
2014-09-10  4:18 Stephen Rothwell
2014-09-10 23:29 ` Rafael J. Wysocki
2014-09-10  4:14 Stephen Rothwell
2014-07-30  2:23 Stephen Rothwell
2014-07-30 12:55 ` Rafael J. Wysocki

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=4444301.nE19g0hn7H@aspire.rjw.lan \
    --to=rjw@rjwysocki.net \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=maxime.ripard@free-electrons.com \
    --cc=olof@lixom.net \
    --cc=quentin.schulz@free-electrons.com \
    --cc=sfr@canb.auug.org.au \
    --cc=viresh.kumar@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).