[PATCH 1/4] ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data

[Rafael J. Wysocki]

On Wednesday, April 30, 2014 07:23:08 PM Simon Horman wrote:
> On Wed, Apr 30, 2014 at 10:53:58AM +0200, Ulf Hansson wrote:
> > On 30 April 2014 00:45, Rafael J. Wysocki <rjw at rjwysocki.net> wrote:
> > > On Friday, April 25, 2014 10:06:51 AM Simon Horman wrote:
> > >> On Thu, Apr 24, 2014 at 01:25:14PM +0200, Ulf Hansson wrote:
> > >> > On 14 April 2014 11:22, Ulf Hansson <ulf.hansson at linaro.org> wrote:
> > >> > > On 14 April 2014 03:20, Simon Horman <horms at verge.net.au> wrote:
> > >> > >> On Fri, Apr 11, 2014 at 05:26:41PM +0200, Ulf Hansson wrote:
> > >> > >>> There are no active users of these callbacks, thus there are no benefit
> > >> > >>> of trying to invoke them.
> > >> > >>>
> > >> > >>> Cc: Simon Horman <horms at verge.net.au>
> > >> > >>> Cc: Magnus Damm <magnus.damm at gmail.com>
> > >> > >>> Signed-off-by: Ulf Hansson <ulf.hansson at linaro.org>
> > >> > >>> ---
> > >> > >>>
> > >> > >>> I am seeking ack from the SOC maintainers since this needs to go with the other
> > >> > >>> patches in this patchset on the PM core.
> > >> > >>
> > >> > >> In order to reduce the possibility of conflicts I would prefer
> > >> > >> to take this patch through my tree.
> > >> > >
> > >> > > Okay, go ahead!
> > >> > >
> > >> >
> > >> > Hi Simon,
> > >> >
> > >> > Just wanted to know, if you decided to queue this patch in your tree.
> > >> > Or were there anything else you needed me to fix here?
> > >>
> > >> Sorry for dropping the ball. I will queue-up this patch.
> > >
> > > OK
> > >
> > > Ulf, since the rest of the series depends on this one (or at least that's
> > > how it looks to me), would you mind resending it when this one gets into the
> > > Linus' tree?
> > 
> > Well, I would prefer if we could go ahead with the rest of the patches
> > somehow for 3.16, but I guess it will be hard if Simon picks up this
> > patch!?
> > 
> > Simon,
> > I guess the reason for your concern were about conflicts, but the file
> > this patch touch has actually not been modified since Sep 2012. So,
> > maybe we could go through Rafaels tree anyway?
> 
> Yes, my primary concern was conflicts.
> But as you point out that seems unlikely.
> 
> I have already picked up the patch but the pull request I sent to
> the ARM SoC maintainers has not been pulled. And regardless it
> won't appear in Linus's tree via that route until v3.16-rc1.
> 
> Perhaps a good way forwards would be for Rafael to also apply the patch
> with my Ack.

Not really.  No duplicate patches with different changelogs coming from
different trees.  Please!

> I could also revert the version applied to my tree
> if that is of any help.
> 
> Acked-by: Simon Horman <horms+renesas at verge.net.au>

Ulf, can you please do as I said?


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