From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>, Vivek Goyal <vgoyal@redhat.com>,
Li Zefan <lizefan@huawei.com>,
linux-kernel@vger.kernel.org, ctalbott@google.com,
rni@google.com
Subject: Re: [GIT PULL] block/for-3.5/core: pull in cgroup/for-3.5
Date: Mon, 2 Apr 2012 11:59:05 +1000 [thread overview]
Message-ID: <20120402115905.cbca9c04113e543163bdb5f2@canb.auug.org.au> (raw)
In-Reply-To: <20120401200306.GB9230@dhcp-172-17-108-109.mtv.corp.google.com>
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
Hi Tejun,
On Sun, 1 Apr 2012 13:03:06 -0700 Tejun Heo <tj@kernel.org> wrote:
>
> cgroup/for-3.5 currently contains the following changes which
> blk-cgroup needs to proceed with the on-going cleanup.
>
> * Dynamic addition and removal of cftypes to make config/stat file
> handling modular for policies.
>
> * cgroup removal update to not wait for css references to drain to fix
> blkcg removal hang caused by cfq caching cfqgs.
>
> Due to the extensive changes in blk-cgroup.c, the pull results in some
> non-trivial conflicts which can be a bit tricky to resolve correctly.
>
> The following branch contains the merged commit. Please feel free to
> pull in as-is or use it as reference. Stephen, cgroup and block next
> branches will cause nasty conflicts until this merge happens, please
> use this commit as merge reference or skip cgroup/for-3.5 for the time
> being.
OK, I have moved the cgroup tree to before the block tree (just so we see
failures in that tree independently of failures in the block tree).
Currently the block tree contains nothing, so we have no conflicts
today. The best way to proceed is for the parts of the cgroup tree that
the block tree will depend on (which may be the entire current cgroup
tree) should be in a separate, stable (i.e. non rebasing/rewriting)
branch that can be merged into both the cgroup and block trees.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-04-02 1:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-01 20:03 Tejun Heo
2012-04-02 1:59 ` Stephen Rothwell [this message]
2012-04-02 18:55 ` Tejun Heo
2012-04-02 19:24 ` Jens Axboe
2012-04-02 19:50 ` 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=20120402115905.cbca9c04113e543163bdb5f2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=ctalbott@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=rni@google.com \
--cc=tj@kernel.org \
--cc=vgoyal@redhat.com \
/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®