linux-next.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>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org, Nishanth Menon <nm@ti.com>,
	Tony Lindgren <tony@atomide.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Tue, 29 Oct 2013 13:08:23 +0100	[thread overview]
Message-ID: <1919820.jZeQGKJQBQ@vostro.rjw.lan> (raw)
In-Reply-To: <20131029190021.bb2dddcbd46e1ddfdfd5e441@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

On Tuesday, October 29, 2013 07:00:21 PM Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/opp.c between commit e4db1c7439b3 ("PM / OPP: rename
> header to linux/pm_opp.h") from the pm tree and commit 92d51856d740
> ("ARM: OMAP3+: do not register non-dt OPP tables for device tree boot")
> from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The fix looks good to me, thanks for fixing this up.

Rafael

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2013-10-29 11:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-29  8:00 linux-next: manual merge of the arm-soc tree with the pm tree Stephen Rothwell
2013-10-29 12:08 ` Rafael J. Wysocki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-08-29  8:04 Stephen Rothwell
2013-08-29 17:57 ` Olof Johansson
2013-09-02 18:09   ` Lorenzo Pieralisi
2013-09-09 17:22     ` Kevin Hilman
2013-09-10  8:59       ` Lorenzo Pieralisi
2013-08-27  8:33 Stephen Rothwell
2013-08-27 15:30 ` Kevin Hilman
2013-04-24  6:54 Stephen Rothwell
2013-04-25 16:15 ` Kukjin Kim
2013-04-10  7:17 Stephen Rothwell
2013-04-10  8:36 ` Kukjin Kim
2013-04-11  8:37   ` Olof Johansson
2013-04-19 10:59     ` Kukjin Kim
2012-09-24  9:21 Stephen Rothwell
2012-09-24 17:02 ` Olof Johansson

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=1919820.jZeQGKJQBQ@vostro.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=nm@ti.com \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=tony@atomide.com \
    /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).