From: Jens Axboe <jens.axboe@oracle.com>
To: Divyesh Shah <dpshah@google.com>
Cc: Vivek Goyal <vgoyal@redhat.com>,
linux-kernel@vger.kernel.org, nauman@google.com,
ctalbott@google.com
Subject: Re: [PATCH][v2] Changes to more io-controller stats patches to address review comments.
Date: Tue, 13 Apr 2010 20:15:29 +0200 [thread overview]
Message-ID: <20100413181528.GC27497@kernel.dk> (raw)
In-Reply-To: <w2naf41c7c41004131026s3b81d78cl6003df56c32da992@mail.gmail.com>
On Tue, Apr 13 2010, Divyesh Shah wrote:
> Hi Jens,
> If this looks ok to you, can you please queue it up? Btw, after
> Gui's patches there is 1 merge conflict in your for-2.6.35 branch when
> applying this patch but it seems pretty straightforward to resolve. In
> case you'd prefer a clean patch that takes care of the merge conflict
> please let me know.
I hand applied that one hunk, and committed it.
But...
block/blk-cgroup.c:271: error: redefinition of ?blkiocg_set_start_empty_time?
block/blk-cgroup.h:208: note: previous definition of ?blkiocg_set_start_empty_time? was here
block/blk-cgroup.c: In function ?blkiocg_set_start_empty_time?:
block/blk-cgroup.c:291: error: implicit declaration of function ?blkio_blkg_empty?
block/blk-cgroup.c:292: error: ?struct blkio_group_stats? has no member named ?start_empty_time?
block/blk-cgroup.c:293: error: implicit declaration of function ?blkio_mark_blkg_empty?
make[1]: *** [block/blk-cgroup.o] Error 1
make: *** [block] Error 2
I merged mainline into for-2.6.35 to resolve a merge conflict, but that
was trivial.
--
Jens Axboe
next prev parent reply other threads:[~2010-04-13 18:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-12 18:41 [PATCH][v2] Changes to more io-controller stats patches to address review comments Divyesh Shah
2010-04-12 22:11 ` Vivek Goyal
2010-04-13 17:26 ` Divyesh Shah
2010-04-13 18:15 ` Jens Axboe [this message]
2010-04-13 21:28 ` Divyesh Shah
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=20100413181528.GC27497@kernel.dk \
--to=jens.axboe@oracle.com \
--cc=ctalbott@google.com \
--cc=dpshah@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nauman@google.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.