From: Tejun Heo <tj@kernel.org>
To: "Rafael J. Wysocki" <rjw@sisk.pl>, sfr@canb.auug.org.au
Cc: linux-pm@vger.kernel.org, linux-next@vger.kernel.org
Subject: merge conflict resolution for pm-freezer
Date: Mon, 28 Nov 2011 15:30:55 -0800 [thread overview]
Message-ID: <20111128233055.GF3858@google.com> (raw)
Hello, Rafael, Stephen.
Linus just pulled cgroup fixes which conflicts with pm-freezer. The
resolution is mostly trivial. The cgroup fix changes frozen() test to
is_task_frozen_enough() while pm-freezer commit prepends "freezing()
&& " to it. They just need to be combined into "freezing() &&
is_task_frozen_enough()".
The following git branch contains merged branch. I pulled the current
linus/master a34815b96 "Merge branch 'for-3.2-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup" into
pm-freezer and resolved the conflict described above.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git pm-freezer-merge
Rafael, please feel free to pull or resolve in any way you see fit.
Thanks.
--
tejun
next reply other threads:[~2011-11-28 23:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-28 23:30 Tejun Heo [this message]
2011-11-29 22:21 ` merge conflict resolution for pm-freezer Rafael J. Wysocki
2011-11-30 19:51 ` Rafael J. Wysocki
2011-12-01 18:53 ` Tejun Heo
2011-12-01 21:42 ` Rafael J. Wysocki
2011-12-05 21:32 ` [PATCH pm/linux-next] cgroup_freezer: drop unnecessary freezing() from try_to_freeze_cgroup() Tejun Heo
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=20111128233055.GF3858@google.com \
--to=tj@kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.