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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 9 Jun 2016 13:34:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jaegeuk Kim <jaegeuk@...nel.org>
Subject: Re: linux-next: manual merge of the block tree with the f2fs tree

Hi all,

On Thu, 9 Jun 2016 13:26:09 +1000 Stephen Rothwell <sfr@...b.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@...hat.com>) fails.
-- 
Cheers,
Stephen Rothwell