public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Tejun Heo <tj@kernel.org>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL pm/for-next] pm: freezer updates
Date: Sun, 6 Nov 2011 13:12:56 +0100	[thread overview]
Message-ID: <201111061312.56256.rjw@sisk.pl> (raw)
In-Reply-To: <201111060101.26814.rjw@sisk.pl>

On Sunday, November 06, 2011, Rafael J. Wysocki wrote:
> On Thursday, November 03, 2011, Tejun Heo wrote:
> > Hello, Rafael.
> > 
> > This is pull request for the following pending patches[ets].
> > 
> >  [1] freezer: fix various bugs and simplify implementation, take#2
> >  [2] usb_storage: don't use set_freezable_with_signal()
> >  [3] freezer: kill unused set_freezable_with_signal()
> >  [4] freezer: fix wait_event_freezable/__thaw_task races
> > 
> > The patches are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git pm-freezer
> 
> I pulled this to linux-pm/pm-freezer, but there were merge conflicts that
> I'm not 100% have been resolved correctly.  Please double check if the
> resulting branch is OK.

I found a mismerge in the meantime, so the linux-pm/pm-freezer branch has
been re-created from scratch.  Please double check if it's correct.

I intend to start merging it into linux-next after 3.2-rc1 has been released.

Thanks,
Rafael

  reply	other threads:[~2011-11-06 12:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-03 22:31 [GIT PULL pm/for-next] pm: freezer updates Tejun Heo
2011-11-06  0:01 ` Rafael J. Wysocki
2011-11-06 12:12   ` Rafael J. Wysocki [this message]
2011-11-06 16:47     ` Tejun Heo
2011-11-06 21:10       ` Rafael J. Wysocki
2011-11-06 21:16         ` Tejun Heo
2011-11-06 21:23           ` Rafael J. Wysocki
2011-11-21 20:38 ` Tejun Heo
2011-11-21 21:23   ` 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=201111061312.56256.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=tj@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