From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kent Overstreet <kmo@daterainc.com>, Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: manual merge of the staging tree with the block tree
Date: Mon, 4 Nov 2013 21:20:10 -0800 [thread overview]
Message-ID: <20131105052010.GA14557@kroah.com> (raw)
In-Reply-To: <20131105160924.4da55b7e36aa2ab93443fdda@canb.auug.org.au>
On Tue, Nov 05, 2013 at 04:09:24PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/lustre/lustre/llite/lloop.c between commit ed2d2f9a8265
> ("block: Abstract out bvec iterator") from the block tree and commit
> de40d1209898 ("staging: lustre: fix bug with LL_MRF_RETURN in
> loop_make_request") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2013-11-05 5:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-05 5:09 linux-next: manual merge of the staging tree with the block tree Stephen Rothwell
2013-11-05 5:20 ` Greg KH [this message]
2013-11-05 9:49 ` Christoph Hellwig
2013-11-05 13:08 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2019-05-01 7:05 Stephen Rothwell
2019-05-01 8:09 ` Gao Xiang
2019-05-08 3:44 ` Stephen Rothwell
2019-05-08 6:02 ` Gao Xiang
2016-06-14 5:07 Stephen Rothwell
2016-07-25 6:32 ` Stephen Rothwell
2011-10-04 6:14 Stephen Rothwell
2011-10-04 15:25 ` Greg KH
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=20131105052010.GA14557@kroah.com \
--to=greg@kroah.com \
--cc=axboe@kernel.dk \
--cc=kmo@daterainc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 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.