Subject: Re: linux-next: manual merge of the block tree with the f2fs tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 9 Jun 2016 13:34:17 +1000

Hi all,

On Thu, 9 Jun 2016 13:26:09 +1000 Stephen Rothwell <[email-masked]> 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
<[email-masked]>) fails.
-- 
Cheers,
Stephen Rothwell