From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932190AbcERVL0 (ORCPT ); Wed, 18 May 2016 17:11:26 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:1807 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752763AbcERVLY (ORCPT ); Wed, 18 May 2016 17:11:24 -0400 Date: Wed, 18 May 2016 17:10:43 -0400 From: Chris Mason To: Stephen Rothwell , LKML , btrfs CC: David Sterba , Filipe Manana Subject: incoming merge conflict to linux-next Message-ID: <20160518211043.qqzesbrmbbr7xba2@floor.thefacebook.com> Mail-Followup-To: Chris Mason , Stephen Rothwell , LKML , btrfs , David Sterba , Filipe Manana MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.5.23.1 (2014-03-12) X-Originating-IP: [192.168.52.123] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-05-18_10:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, Dave Sterba's tree in linux-next has a few btrfs patches that we're not sending yet into Linus. We've got an update for Josef's enospc work that'll get sent in next week. So he prepped a pull for me that merged up a number of his branches but didn't include Josef's new code. It has all been in -next for some time, and then I put some fixes from Filipe on top. Long story short, you'll get a merge conflict from my next branch: https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git next I've got the sample resolution in next-merge: https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git next-merge Please let us know if you have any problems. -chris