From: Tejun Heo <tj@kernel.org>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
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 10:53:33 -0800 [thread overview]
Message-ID: <20111201185322.GC13173@google.com> (raw)
In-Reply-To: <201111302051.54501.rjw@sisk.pl>
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.
Thanks.
--
tejun
next prev parent reply other threads:[~2011-12-01 18:53 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 [this message]
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=20111201185322.GC13173@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).