Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 24 Apr 2023 11:43:24 +0200
From:   Jan Kara <jack@suse.cz>
To:     "Darrick J. Wong" <djwong@kernel.org>
Cc:     Ritesh Harjani <ritesh.list@gmail.com>, Jan Kara <jack@suse.cz>,
        linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
        Christoph Hellwig <hch@infradead.org>,
        Ojaswin Mujoo <ojaswin@linux.ibm.com>,
        Disha Goel <disgoel@linux.ibm.com>, Ted Tso <tytso@mit.edu>
Subject: Re: [PATCHv6 0/9] ext2: DIO to use iomap
Message-ID: <20230424094324.lq3nqfj54hocm423@quack3>
References: <20230421112324.mxrrja2hynshu4b6@quack3>
 <87edodigo4.fsf@doe.com>
 <20230421154058.GH360881@frogsfrogsfrogs>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230421154058.GH360881@frogsfrogsfrogs>
Precedence: bulk

On Fri 21-04-23 08:40:58, Darrick J. Wong wrote:
> On Fri, Apr 21, 2023 at 05:35:47PM +0530, Ritesh Harjani wrote:
> > Jan Kara <jack@suse.cz> writes:
> > 
> > > Hello Ritesh,
> > >
> > > On Fri 21-04-23 15:16:10, Ritesh Harjani (IBM) wrote:
> > >> Hello All,
> > >>
> > >> Please find the series which rewrites ext2 direct-io path to use modern
> > >> iomap interface.
> > >
> > > The patches now all look good to me. I'd like to discuss a bit how to merge
> > 
> > Thanks Jan,
> > 
> > 
> > > them. The series has an ext4 cleanup (patch 3) and three iomap patches
> > 
> > Also Patch-3 is on top of ext4 journalled data patch series of yours,
> > otheriwse we might see a minor merge conflict.
> > 
> > https://lore.kernel.org/all/20230329154950.19720-6-jack@suse.cz/
> > 
> > > (patches 6, 8 and 9). Darrick, do you want to take the iomap patches through
> > > your tree?
> 
> Hmm.  I could do that for 6.4 since the first one should be trivially
> verifiable and so far Linus hasn't objected to patches that add
> tracepoints being thrown into for-next right at the start of the merge
> window.

Great! Then I'll wait a bit until rc1 when your iomap tree + Ted's ext4
tree should have landed in Linus' tree and push the ext2+ext4 patches into
my tree to a branch based on rc1 which should deal with all the merge
troubles.

								Honza
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR