On Fri 09-08-13 10:19:33, Tejun Heo wrote:
> Hello, Michal.
> 
> On Fri, Aug 09, 2013 at 09:22:07AM +0200, Michal Hocko wrote:
> > I have just tried to merge cgroups/for-3.12 into my memcg tree and there
> > were some conflicts indeed. They are attached for reference. The
> > resolving is trivial. I've just picked up HEAD as all the conflicts are
> > for added resp. removed code in mmotm.
> 
> Oops, that's me messing up the branches.  I was trying to reset
> for-next but instead reset for-3.12 so that it didn't include the API
> updates.  Can you please try to rebase on top of the current for-3.12
> bd8815a6d802fc16a7a106e170593aa05dc17e72 ("cgroup: make
> css_for_each_descendant() and friends include the origin css in the
> iteration")?  At least the iterator update wouldn't be trivial, I
> think.

Very quick and untested attempt for resolving is attached. I will be
shortly offline and I am not sure how much I will be available during
weekend.

Andrew, if you prefer then drop the series and I will rebase it on top
of linux-next after Tejun's changes are merged and post it again early
next week.
-- 
Michal Hocko
SUSE Labs