From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f71.google.com (mail-lf0-f71.google.com [209.85.215.71]) by kanga.kvack.org (Postfix) with ESMTP id B072D6B0038 for ; Tue, 18 Oct 2016 05:49:34 -0400 (EDT) Received: by mail-lf0-f71.google.com with SMTP id n3so7730393lfn.5 for ; Tue, 18 Oct 2016 02:49:34 -0700 (PDT) Received: from mx2.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id d190si21898701lfg.205.2016.10.18.02.49.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 18 Oct 2016 02:49:33 -0700 (PDT) Date: Tue, 18 Oct 2016 11:49:31 +0200 From: Jan Kara Subject: Re: [PATCH 0/20 v3] dax: Clear dirty bits after flushing caches Message-ID: <20161018094931.GM3359@quack2.suse.cz> References: <1474992504-20133-1-git-send-email-jack@suse.cz> <20160930091418.GC24352@infradead.org> <20161003075902.GG6457@quack2.suse.cz> <20161003080337.GA13688@infradead.org> <20161003081549.GH6457@quack2.suse.cz> <20161003093248.GA27720@infradead.org> <20161003111358.GQ6457@quack2.suse.cz> <20161013203434.GD26922@linux.intel.com> <20161017084732.GD3359@quack2.suse.cz> <20161017185955.GA13782@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161017185955.GA13782@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: Ross Zwisler Cc: Jan Kara , Dave Chinner , Andrew Morton , Christoph Hellwig , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-nvdimm@ml01.01.org, Dan Williams , "Kirill A. Shutemov" On Mon 17-10-16 12:59:55, Ross Zwisler wrote: > On Mon, Oct 17, 2016 at 10:47:32AM +0200, Jan Kara wrote: > > > This week I plan to rebase both series on top of rc1 + your THP patches so > > that we can move on with merging the stuff. > > Yea...so how are we going to coordinate merging of these series for the v4.10 > merge window? My series mostly changes DAX, but it also changes XFS, ext2 and > ext4. I think the plan right now is to have Dave Chinner take it through his > XFS tree. > > Your first series is mostly mm changes with some DAX sprinkled in, and your > second series touches dax, mm and all 3 DAX filesystems. > > What is the best way to handle all this? Have it go through one central tree > (-MM?), even though the changes touch code that exists outside of that trees > normal domain (like the FS code)? Have my series go through the XFS tree and > yours through -MM, and give Linus a merge resolution patch? Something else? For your changes to go through XFS tree is IMO fine (changes outside of XFS & DAX are easy). Let me do the rebase first and then discuss how to merge my patches after that... Honza -- Jan Kara SUSE Labs, CR -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org