From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752368AbbHXEPm (ORCPT ); Mon, 24 Aug 2015 00:15:42 -0400 Received: from ozlabs.org ([103.22.144.67]:52334 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750715AbbHXEPk (ORCPT ); Mon, 24 Aug 2015 00:15:40 -0400 Date: Mon, 24 Aug 2015 14:15:35 +1000 From: Stephen Rothwell To: Jens Axboe , Chris Mason , Josef Bacik Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet Subject: linux-next: manual merge of the block tree with the btrfs tree Message-ID: <20150824141535.42e0c4e1@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-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/btrfs/volumes.c between commits: da2f0f74cf7d ("Btrfs: add support for blkio controllers") 3a9508b0221d ("btrfs: fix compile when block cgroups are not enabled") from the btrfs tree and commit: 0e28997ec476 ("btrfs: remove bio splitting and merge_bvec_fn() calls") from the block tree. I fixed it up (I removed breakup_stripe_bio) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au