From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Tejun Heo <tj@kernel.org>
Cc: sfr@canb.auug.org.au, linux-pm@vger.kernel.org,
linux-next@vger.kernel.org
Subject: Re: merge conflict resolution for pm-freezer
Date: Thu, 1 Dec 2011 22:42:57 +0100 [thread overview]
Message-ID: <201112012242.58090.rjw@sisk.pl> (raw)
In-Reply-To: <20111201185322.GC13173@google.com>
On Thursday, December 01, 2011, Tejun Heo wrote:
> Hello, Rafael. (Sorry about the delay).
>
> On Wed, Nov 30, 2011 at 08:51:54PM +0100, Rafael J. Wysocki wrote:
> > > > Rafael, please feel free to pull or resolve in any way you see fit.
> > >
> > > Well, could you please post a fix patch on top of my pm-freezer branch?
> > > That would be the most convenient way to me. :-)
> >
> > No, that won't work. I think I'll resolve the conflict when merging pm-freezer
> > into pm-for-linus later.
>
> Heh, yeah, I was a bit confused. If you don't want to pull it
> directly, I think the best way would be merging and then comparing the
> two trees.
Can you please double check if cgroup_freezer.c is correct in my linux-next
branch?
Rafael
next prev parent reply other threads:[~2011-12-01 21:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-28 23:30 merge conflict resolution for pm-freezer Tejun Heo
2011-11-29 22:21 ` 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 [this message]
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=201112012242.58090.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=linux-next@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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 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.