From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: linux-next: build failure after merge of the cgroup tree
Date: Sun, 27 Nov 2011 11:33:44 -0800 [thread overview]
Message-ID: <20111127193336.GD4266@google.com> (raw)
In-Reply-To: <20111125145022.d5578c15eb900e2628a072b2@canb.auug.org.au>
Hello,
On Fri, Nov 25, 2011 at 02:50:22PM +1100, Stephen Rothwell wrote:
> I don't know how to fix this up (the obvious fix will cause us to have
> nested rcu_read_lock()s and I have no idea if that is allowed). Can you
> please provide me with a merge resolution? I am also wondering why such
> closely related work is happening in 2 different trees.
Sorry about all the conflicts. There have been major updates to both
freezer and cgroup and cgroup_freezer happens to receive changes from
both subsystem changes. I dropped cgroup changes for now as Linus
doesn't seem to be too happy with the current approach. Once an
agreeable approach is found, I'll pull in pm-freezer branch into
cgroup and then put cgroup changes on top of them. That should remove
most of merging headaches.
Thanks.
--
tejun
next prev parent reply other threads:[~2011-11-27 19:33 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-25 3:50 linux-next: build failure after merge of the cgroup tree Stephen Rothwell
2011-11-27 19:33 ` Tejun Heo [this message]
2012-09-14 3:17 Stephen Rothwell
2012-09-14 6:56 ` Daniel Wagner
2012-09-14 17:00 ` Tejun Heo
2012-09-14 18:32 ` Sedat Dilek
2012-09-14 18:34 ` Tejun Heo
2012-09-15 7:55 ` Sedat Dilek
2013-04-29 4:04 Stephen Rothwell
2013-04-29 22:55 ` Tejun Heo
2013-04-30 1:51 ` Benjamin Herrenschmidt
2014-02-26 6:46 Stephen Rothwell
2014-02-26 13:44 ` Tejun Heo
2015-09-25 3:26 Stephen Rothwell
2021-04-22 6:31 Stephen Rothwell
2021-05-11 0:51 Stephen Rothwell
2021-05-11 1:10 ` Roman Gushchin
2021-05-11 1:31 ` Tejun Heo
2022-08-29 3:29 Stephen Rothwell
2022-09-12 6:18 Stephen Rothwell
2022-09-12 7:38 ` Peter Zijlstra
2022-09-12 18:44 ` Tejun Heo
2022-09-12 22:16 ` Tejun Heo
2022-09-15 10:46 ` Peter Zijlstra
2022-10-10 20:57 ` Stephen Rothwell
2022-10-10 20:59 ` Tejun Heo
2022-10-31 2:23 Stephen Rothwell
2022-10-31 17:52 ` Tejun Heo
2023-07-17 1:34 Stephen Rothwell
2023-07-17 6:45 ` Miaohe Lin
2023-12-07 3:38 Stephen Rothwell
2023-12-07 4:18 ` Waiman Long
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=20111127193336.GD4266@google.com \
--to=tj@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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).