From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Viro Subject: Re: [PATCH v6 00/28] fs: fixes for serious clone/dedupe problems Date: Mon, 22 Oct 2018 05:52:49 +0100 Message-ID: <20181022045249.GP32577@ZenIV.linux.org.uk> References: <154013850285.29026.16168387526580596209.stgit@magnolia> <20181022022112.GW6311@dastard> <20181022043741.GX6311@dastard> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20181022043741.GX6311@dastard> Sender: linux-btrfs-owner@vger.kernel.org To: Dave Chinner Cc: "Darrick J. Wong" , sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com List-Id: linux-unionfs@vger.kernel.org On Mon, Oct 22, 2018 at 03:37:41PM +1100, Dave Chinner wrote: > Ok, this is a bit of a mess. the patches do not merge cleanly to a > 4.19-rc1 base kernel because of all the changes to > include/linux/fs.h that have hit the tree after this. There's also > failures against Documentation/filesystems/fs.h > > IOWs, it's not going to get merged through the main XFS tree because > I don't have the patience to resolve all the patch application > failures, then when it comes to merge make sure all the merge > failures end up being resolved correctly. > > So if I take it through the XFS tree, it will being a standalone > branch based on 4.19-rc8 and won't hit linux-next until after the > first XFS merge when I can rebase the for-next branch... How many conflicts does it have with XFS tree? I can take it via vfs.git... From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Viro Date: Mon, 22 Oct 2018 05:52:49 +0100 Subject: [Ocfs2-devel] [PATCH v6 00/28] fs: fixes for serious clone/dedupe problems In-Reply-To: <20181022043741.GX6311@dastard> References: <154013850285.29026.16168387526580596209.stgit@magnolia> <20181022022112.GW6311@dastard> <20181022043741.GX6311@dastard> Message-ID: <20181022045249.GP32577@ZenIV.linux.org.uk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dave Chinner Cc: "Darrick J. Wong" , sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com On Mon, Oct 22, 2018 at 03:37:41PM +1100, Dave Chinner wrote: > Ok, this is a bit of a mess. the patches do not merge cleanly to a > 4.19-rc1 base kernel because of all the changes to > include/linux/fs.h that have hit the tree after this. There's also > failures against Documentation/filesystems/fs.h > > IOWs, it's not going to get merged through the main XFS tree because > I don't have the patience to resolve all the patch application > failures, then when it comes to merge make sure all the merge > failures end up being resolved correctly. > > So if I take it through the XFS tree, it will being a standalone > branch based on 4.19-rc8 and won't hit linux-next until after the > first XFS merge when I can rebase the for-next branch... How many conflicts does it have with XFS tree? I can take it via vfs.git...