linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Tony Lindgren <tony@atomide.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
	pavel@ucw.cz, linux@roeck-us.net, rostedt@goodmis.org,
	linux-pm@vger.kernel.org
Subject: Re: Power driver patches to avoid lockdep complaints
Date: Mon, 22 Aug 2016 17:59:17 -0700	[thread overview]
Message-ID: <20160823005917.GY3482@linux.vnet.ibm.com> (raw)
In-Reply-To: <20160823004549.b66jru7ogyfifunf@atomide.com>

On Mon, Aug 22, 2016 at 05:45:49PM -0700, Tony Lindgren wrote:
> * Rafael J. Wysocki <rjw@rjwysocki.net> [160822 10:30]:
> > On Saturday, August 20, 2016 07:28:37 AM Tony Lindgren wrote:
> > > * Rafael J. Wysocki <rjw@rjwysocki.net> [160819 18:35]:
> > > > On Thursday, August 18, 2016 03:51:52 PM Tony Lindgren wrote:
> > > > > Hi,
> > > > > 
> > > > > * Paul E. McKenney <paulmck@linux.vnet.ibm.com> [160615 14:16]:
> > > > > > Hello!
> > > > > > 
> > > > > > Ingo was not comfortable taking these through -tip, which is understandable,
> > > > > > given that they don't depend on each other or on anything else not already
> > > > > > in mainline, and that they don't have anything to do with -tip.
> > > > > > 
> > > > > > So what would you guys like to do with these?
> > > > > > 
> > > > > > They may be pulled from 13e698e68f75 (power: Use _rcuidle for
> > > > > > suspend/resume tracepoints) in my -rcu tree:
> > > > > > 
> > > > > > 	git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
> > > > > > 
> > > > > 
> > > > > Rafael, looks like commit 13e698e68f75 is still missing from the
> > > > > mainline tree. Care to merge it to your fixes so I don't have to
> > > > > keep looking at that splat on daily basis?
> > > > 
> > > > I could pull it if I knew where to pull it from.  The above gives me
> > > > "Already up-to-date."
> > > 
> > > Here are the ones still missing:
> > > 
> > > $ git log --pretty=oneline v4.7-rc2..13e698e68f75
> > > 13e698e68f75708c45241a2dad23cd6b65181056 power: Use _rcuidle for suspend/resume tracepoints
> > > 320e2a2d081b6c519f80fca9377b8fb90db7bb9c power: Add _rcuidle suffix to allow rpm_resume() to be called from idle
> > > b72aadb1d082d3935cbffd60e979238252045971 power: Add _rcuidle suffix to allow rpm_idle() use from idle
> > > 
> > > So maybe just git merge 13e698e68f75 if you have the linux-rcu.git
> > > fetched and the above look OK to you?
> > 
> > If I do
> > 
> > $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
> > 
> > and then
> > 
> > $ git show 13e698e68f75
> > 
> > then it tells me
> > 
> > fatal: ambiguous argument '13e698e68f75': unknown revision or path not in the working tree.
> > 
> > Do I need to fetch it in any special way or something?
> 
> Well I usuall add things to my .git/config like:
> 
> [remote "rcu"]
> 	url = git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
> 	fetch = refs/heads/*:refs/remotes/rcu/*
> 
> And then do git fetch --no-tags on what I need. There's probably
> some easy way to do that temporarily too :)
> 
> But now doing git fetch --no-tags rcu here with produces this
> for me:
> ...
>  ! [rejected]        rcu/dev    -> rcu/rcu/dev  (non-fast-forward)
>  ! [rejected]        rcu/next   -> rcu/rcu/next  (non-fast-forward)
> 
> So maybe that branch got trashed and the commit is there no more.

The trick is that rcu/dev and rcu/next simply mark my current development
branch and the stuff I want Stephen Rothwell to pull into -next,
respectively.

> Paul, do you have 13e698e68f75 still somewhere or want me to push
> out a branch with that?

The permanent branch name for those changes is power.2016.06.15a,
so those should be pullable from anywhere.

Or please do feel free to push from your tree if that works better.
However they get where they need to go, I am good!  ;-)

							Thanx, Paul


  reply	other threads:[~2016-08-23  0:59 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-15 21:13 Power driver patches to avoid lockdep complaints Paul E. McKenney
2016-08-18 22:51 ` Tony Lindgren
2016-08-20  1:40   ` Rafael J. Wysocki
2016-08-20 14:28     ` Tony Lindgren
2016-08-22 17:34       ` Rafael J. Wysocki
2016-08-22 17:43         ` Paul E. McKenney
2016-08-23  0:45         ` Tony Lindgren
2016-08-23  0:59           ` Paul E. McKenney [this message]
2016-08-23  1:52             ` Rafael J. Wysocki
2016-08-23 10:16               ` Paul E. McKenney
2016-09-15 19:41                 ` Tony Lindgren
2016-09-15 19:52                   ` Tony Lindgren
2016-09-15 20:41                     ` Rafael J. Wysocki
2016-09-15 21:45                       ` Tony Lindgren

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=20160823005917.GY3482@linux.vnet.ibm.com \
    --to=paulmck@linux.vnet.ibm.com \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=pavel@ucw.cz \
    --cc=rjw@rjwysocki.net \
    --cc=rostedt@goodmis.org \
    --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).