mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Michal Hocko <mhocko@suse.cz>, "Rafael J. Wysocki" <rjw@sisk.pl>
Subject: linux-next: manual merge of the cgroup tree with the pm tree
Date: Thu, 24 Nov 2011 15:20:18 +1100	[thread overview]
Message-ID: <20111124152018.66ee4f15447837dd01443fdb@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

Hi Tejun,

Today's linux-next merge of the cgroup tree got a conflict in
kernel/cgroup_freezer.c between commit 6907483b4e80 ("freezer: make
freezing indicate freeze condition in effect") from the pm tree and
commit 41dfa07cedcc ("cgroup_freezer: fix freezing groups with stopped
tasks") from the cgroup tree.

I think that the latter is a superset of the former (but I may be wrong),
so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2011-11-24  4:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-24  4:20 Stephen Rothwell [this message]
2011-11-24 21:12 ` Tejun Heo
2011-11-24 23:13   ` Stephen Rothwell
2011-11-25  3:21 Stephen Rothwell

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=20111124152018.66ee4f15447837dd01443fdb@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mhocko@suse.cz \
    --cc=rjw@sisk.pl \
    --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
all inboxes | Powered by JetHome®