From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752917AbbG3DTr (ORCPT ); Wed, 29 Jul 2015 23:19:47 -0400 Received: from ozlabs.org ([103.22.144.67]:33441 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751130AbbG3DTq (ORCPT ); Wed, 29 Jul 2015 23:19:46 -0400 Date: Thu, 30 Jul 2015 13:19:43 +1000 From: Stephen Rothwell To: Jens Axboe , Jaegeuk Kim Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Chao Yu Subject: linux-next: manual merge of the block tree with the f2fs tree Message-ID: <20150730131943.3ab8bac5@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) 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 Jens, Today's linux-next merge of the block tree got a conflict in: fs/f2fs/data.c between commit: 8e5b935bf1ce ("f2fs: maintain extent cache in separated file") from the f2fs tree and commit: 4246a0b63bd8 ("block: add a bi_error field to struct bio") from the block tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc fs/f2fs/data.c index 111f180fd1d2,8f0baa7ffb50..000000000000 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@@ -27,7 -26,10 +27,7 @@@ #include "trace.h" #include - static void f2fs_read_end_io(struct bio *bio, int err) -static struct kmem_cache *extent_tree_slab; -static struct kmem_cache *extent_node_slab; - + static void f2fs_read_end_io(struct bio *bio) { struct bio_vec *bvec; int i;