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,
Li Zefan <lizf@cn.fujitsu.com>, Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: manual merge of the cgroup tree with the block tree
Date: Wed, 7 Mar 2012 11:17:42 -0800 [thread overview]
Message-ID: <20120307191742.GB30676@google.com> (raw)
In-Reply-To: <20120307160516.53086e588a8246edd87c41fc@canb.auug.org.au>
On Wed, Mar 07, 2012 at 04:05:16PM +1100, Stephen Rothwell wrote:
> Hi Tejun,
>
> Today's linux-next merge of the cgroup tree got a conflict in
> block/blk-cgroup.c between commit 7ee9c5620504 ("blkcg: let blkio_group
> point to blkio_cgroup directly") from the block tree and commit
> 761b3ef50e1c ("cgroup: remove cgroup_subsys argument from callbacks")
> from the cgroup tree.
>
> I fixed it up (I hope - see below) and can carry the fix as necessary.
Yeap, looks correct to me.
Thank you very much.
--
tejun
next prev parent reply other threads:[~2012-03-07 19:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 5:05 linux-next: manual merge of the cgroup tree with the block tree Stephen Rothwell
2012-03-07 19:17 ` Tejun Heo [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-06-24 7:52 Stephen Rothwell
2019-07-09 0:00 ` Stephen Rothwell
2011-12-20 6:10 Stephen Rothwell
2011-12-27 17:41 ` 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=20120307191742.GB30676@google.com \
--to=tj@kernel.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--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