From: Tejun Heo <tj@kernel.org>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-kernel@vger.kernel.org,
linux-pm@lists.linux-foundation.org, arnd@arndb.de,
oleg@redhat.com, lizf@cn.fujitsu.com, paul@paulmenage.org,
Matt Helsley <matthltc@us.ibm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: Re: [GIT PULL pm-next] freezer: fix various bugs and simplify implementation
Date: Sun, 21 Aug 2011 11:12:00 +0200 [thread overview]
Message-ID: <20110821091200.GB24151@htj.dyndns.org> (raw)
In-Reply-To: <201108201833.39089.rjw@sisk.pl>
Hello, Rafafel.
On Sat, Aug 20, 2011 at 06:33:38PM +0200, Rafael J. Wysocki wrote:
> > ssh://master.kernel.org/pub/scm/linux/kernel/git/tj/misc.git freezer
>
> Pulled and stored in the pm-freezer branch in my tree, and merged into
> the linux-next branch.
Cool.
> > FYI, this patchset will cause a conflict with s390 TIF flag fix patch.
> > The conflict is trivial and Stephen should be able to handle it
> > without any problem. Also, I'm planning on doing some further work on
> > cgroup freezer and then will try to bridge it with job control. If
> > that plan fans out, I might ask Oleg to pull from the pm tree.
>
> I'm not sure if Linus likes it. He generally doesn't want the trees
> that he pulls from to be entangled this way.
The job control portion has to go through Linus anyway, so let's see
how that flies.
> > This shouldn't matter too much either way but it *might* be a good idea to
> > keep this line of patches in a separate branch.
>
> I'm going to keep it in the pm-freezer branch anyway (there may be patches
> on top of it, though)
Yeah, I'm pretty sure it will need some fix too.
Thanks.
--
tejun
next prev parent reply other threads:[~2011-08-21 9:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-20 9:44 Tejun Heo
2011-08-20 16:33 ` Rafael J. Wysocki
2011-08-21 9:12 ` Tejun Heo [this message]
2011-08-21 18:03 ` Rafael J. Wysocki
2011-08-22 9:58 ` Tejun Heo
2011-08-22 18:50 ` 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=20110821091200.GB24151@htj.dyndns.org \
--to=tj@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=lizf@cn.fujitsu.com \
--cc=matthltc@us.ibm.com \
--cc=oleg@redhat.com \
--cc=paul@paulmenage.org \
--cc=rjw@sisk.pl \
--cc=schwidefsky@de.ibm.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
all inboxes | Powered by JetHome®