Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 8 Jul 2021 11:52:17 +0200
From:   Jan Kara <jack@suse.cz>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Jaegeuk Kim <jaegeuk@kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux F2FS Dev Mailing List 
        <linux-f2fs-devel@lists.sourceforge.net>, Jan Kara <jack@suse.cz>
Subject: Re: [GIT PULL] f2fs for 5.14-rc1
Message-ID: <20210708095217.GA32434@quack2.suse.cz>
References: <YOYHejl3CgABOnhP@google.com>
 <20210708094647.7c0d3060@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210708094647.7c0d3060@canb.auug.org.au>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

On Thu 08-07-21 09:46:47, Stephen Rothwell wrote:
> Hi Jaegeuk,
> 
> On Wed, 7 Jul 2021 12:58:50 -0700 Jaegeuk Kim <jaegeuk@kernel.org> wrote:
> >
> > Could you please consider this pull request?
> > 
> > Thanks,
> > 
> > The following changes since commit bd3c9cdb21a2674dd0db70199df884828e37abd4:
> > 
> >   Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (2021-05-14 10:52:47 -0700)
> > 
> > are available in the Git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git tags/f2fs-for-5.14-rc1
> > 
> > for you to fetch changes up to 28607bf3aa6f9762b32dc7f1ed0488823c0651b8:
> > 
> >   f2fs: drop dirty node pages when cp is in error status (2021-07-06 22:05:06 -0700)
> 
> Its worth mentioning the semantic conflict against the ext3 tree (which
> hasn't been merged by Linus yet, but presumably will be).

Whether that particular series causing the conflict will be merged by Linus
in this merge window is uncertain - Linus didn't like how filemap_fault()
unconditionally acquired the lock. I've created an optimization patch to avoid
that but review is pending... At this point I'm leaning towards the variant
that series won't go in during the merge window. In that case I'll
probably rebase on top of rc1 and force-push everything.

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