Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751907AbbHTRja (ORCPT ); Thu, 20 Aug 2015 13:39:30 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:41173 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751801AbbHTRj1 (ORCPT ); Thu, 20 Aug 2015 13:39:27 -0400 Date: Thu, 20 Aug 2015 13:39:18 -0400 From: Chris Mason To: "linux-btrfs@vger.kernel.org" , LKML , Stephen Rothwell Subject: linux-next conflict resolution branch for btrfs Message-ID: <20150820173918.GA10637@ret.thefacebook.com> Mail-Followup-To: Chris Mason , "linux-btrfs@vger.kernel.org" , LKML , Stephen Rothwell 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:5.14.151,1.0.33,0.0.0000 definitions=2015-08-20_08:2015-08-20,2015-08-20,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 475 Lines: 14 Hi Stephen, There are a few conflicts for btrfs in linux-next this time. They are small, but I pushed out the merge commit I'm using here: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next-merge -chris -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/