From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jaegeuk Kim <jaegeuk@kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the f2fs tree
Date: Thu, 9 Jun 2016 13:34:17 +1000 [thread overview]
Message-ID: <20160609133417.75be271b@canb.auug.org.au> (raw)
In-Reply-To: <20160609132609.449a7d23@canb.auug.org.au>
Hi all,
On Thu, 9 Jun 2016 13:26:09 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got conflicts in:
>
> fs/f2fs/data.c
> fs/f2fs/segment.c
>
> between commits:
>
> 0a87f664d1ad ("f2fs: detect congestion of flush command issues")
> 19a5f5e2ef37 ("f2fs: drop any block plugging")
>
> from the f2fs tree and commits:
>
> 4e49ea4a3d27 ("block/fs/drivers: remove rw argument from submit_bio")
> 04d328defd06 ("f2fs: use bio op accessors")
>
> from the block tree.
Can someone give me a good address for Mike Christie, please - the
address in those block tree commits (Mike Christie
<mchristi@redhat.com>) fails.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-06-09 3:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-09 3:26 linux-next: manual merge of the block tree with the f2fs tree Stephen Rothwell
2016-06-09 3:34 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-12-03 3:43 Stephen Rothwell
2020-12-03 3:47 ` Chao Yu
2020-12-03 3:57 ` Stephen Rothwell
2020-12-14 20:12 ` Stephen Rothwell
2020-12-17 1:50 ` Stephen Rothwell
2016-11-22 3:42 Stephen Rothwell
2016-07-11 4:52 Stephen Rothwell
2016-06-20 2:37 Stephen Rothwell
2015-07-30 3:19 Stephen Rothwell
2014-01-06 6:03 Stephen Rothwell
2013-12-18 3:57 Stephen Rothwell
2013-12-12 2:57 Stephen Rothwell
2013-12-02 4:04 Stephen Rothwell
2013-11-26 1:00 Stephen Rothwell
2013-11-26 0:56 Stephen Rothwell
2013-11-01 3:29 Stephen Rothwell
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=20160609133417.75be271b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).