Re: [GIT PULL] block/for-3.5/core: pull in cgroup/for-3.5

[Stephen Rothwell]

Hi Tejun,

On Sun, 1 Apr 2012 13:03:06 -0700 Tejun Heo <tj@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature