From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426223AbcFIDeU (ORCPT ); Wed, 8 Jun 2016 23:34:20 -0400 Received: from ozlabs.org ([103.22.144.67]:41101 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423671AbcFIDeT (ORCPT ); Wed, 8 Jun 2016 23:34:19 -0400 Date: Thu, 9 Jun 2016 13:34:17 +1000 From: Stephen Rothwell To: Jens Axboe Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jaegeuk Kim Subject: Re: linux-next: manual merge of the block tree with the f2fs tree Message-ID: <20160609133417.75be271b@canb.auug.org.au> In-Reply-To: <20160609132609.449a7d23@canb.auug.org.au> References: <20160609132609.449a7d23@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Thu, 9 Jun 2016 13:26:09 +1000 Stephen Rothwell 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 ) fails. -- Cheers, Stephen Rothwell