linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	"linux-pm >> Linux PM mailing list" <linux-pm@vger.kernel.org>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL] cpuidle: A few improvements for ARM cpuidle via DT
Date: Fri, 21 Nov 2014 16:56:22 +0100	[thread overview]
Message-ID: <17509116.2bjC4d8bef@vostro.rjw.lan> (raw)
In-Reply-To: <546C6DEB.8060204@linaro.org>

On Wednesday, November 19, 2014 11:16:11 AM Daniel Lezcano wrote:
> 
> Hi Rafael,
> 
> this pull request, based on 3.18-rc5, contains a set of changes from 
> Lorenzo Pieralisi.
> 
>   * Added a 'status' definition flag in the DT to specify the 
> unsupported firmware idle states and ignore those states in the parsing 
> code when initializing the cpuidle driver
> 
>   * Added an idle state description in the DT. As the idle states are 
> not standardized on ARM, the description gives information about the 
> idle state
> 
>   * Removed duplicate error message in the arm64 cpuidle drivers
> 
> Thanks !
> 
>    -- Daniel
> 
> 
> The following changes since commit fc14f9c1272f62c3e8d01300f52467c0d9af50f9:
> 
>    Linux 3.18-rc5 (2014-11-16 16:36:20 -0800)
> 
> are available in the git repository at:
> 
>    http://git.linaro.org/git-ro/people/daniel.lezcano/linux.git cpuidle/3.19
> 
> for you to fetch changes up to 18f95a3640dbf421ab9532e517070a0c1cd4d582:
> 
>    drivers: cpuidle: Remove cpuidle-arm64 duplicate error messages 
> (2014-11-19 10:16:28 +0100)

Pulled, but I had a conflict with one patch from you I'd already queued up for
3.19-rc1.

Can you please have a look at my bleeding-edge branch and check if I resolved
the conflict correctly?

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

  parent reply	other threads:[~2014-11-21 15:35 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-19 10:16 [GIT PULL] cpuidle: A few improvements for ARM cpuidle via DT Daniel Lezcano
2014-11-19 10:17 ` [PATCH 1/3] drivers: cpuidle: Add status property to ARM idle states Daniel Lezcano
2014-11-19 10:17   ` [PATCH 2/3] drivers: cpuidle: Add idle-state-name description " Daniel Lezcano
2014-11-19 10:17   ` [PATCH 3/3] drivers: cpuidle: Remove cpuidle-arm64 duplicate error messages Daniel Lezcano
2014-11-21 15:56 ` Rafael J. Wysocki [this message]
2014-11-21 16:13   ` [GIT PULL] cpuidle: A few improvements for ARM cpuidle via DT Daniel Lezcano

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=17509116.2bjC4d8bef@vostro.rjw.lan \
    --to=rjw@rjwysocki.net \
    --cc=Lorenzo.Pieralisi@arm.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.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).