From: Frederic Weisbecker <fweisbec@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tejun Heo <tj@kernel•org>
Subject: Re: linux-next: manual merge of the akpm tree with the cgroup tree
Date: Wed, 14 Dec 2011 17:16:31 +0100 [thread overview]
Message-ID: <20111214161628.GC10791@somewhere.redhat.com> (raw)
In-Reply-To: <20111214175101.daac0549e5ed9d766c3a9bb5@canb.auug.org.au>
On Wed, Dec 14, 2011 at 05:51:01PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpme tree got conflicts in several files
> between commits from the cgroup tree and commit "cgroups: add previous
> cgroup in can_attach_task/attach_task callbacks" from the akpm tree.
>
> This got a bit to hard to resolve, so I dropped that patch and the
> following from the akpm tree.
Yeah there are many things I need to update to get a clean rebase.
>
> cgroups: new cancel_attach_task() subsystem callback
> cgroups: ability to stop res charge propagation on bounded ancestor
> cgroups: add res counter common ancestor searching
> res_counter: allow charge failure pointer to be null
> cgroups: pull up res counter charge failure interpretation to caller
> cgroups: allow subsystems to cancel a fork
> cgroups: add a task counter subsystem
> cgroups: ERR_PTR needs err.h
> cgroup: Fix task counter common ancestor logic
> cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes
>
> I am wondering if that patch set should be included in the cgroup tree?
That would be probably the easier solution.
Andrew, do you mind if I rebase these patches and target them to Tejun's
tree instead? We can keep them on a standalone branch there based on Tejuns until
we reach an agreement on their upstreamability.
next prev parent reply other threads:[~2011-12-14 16:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-14 6:51 linux-next: manual merge of the akpm tree with the cgroup tree Stephen Rothwell
2011-12-14 16:16 ` Frederic Weisbecker [this message]
2011-12-14 18:08 ` Andrew Morton
2011-12-14 18:11 ` Frederic Weisbecker
-- strict thread matches above, loose matches on Subject: below --
2012-11-06 4:51 Stephen Rothwell
2012-11-06 4:58 Stephen Rothwell
2015-12-21 7:13 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=20111214161628.GC10791@somewhere.redhat.com \
--to=fweisbec@gmail$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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