Hi Jan, On Thu, 8 Jul 2021 11:52:17 +0200 Jan Kara wrote: > > 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. No worries, thanks for the reply. -- Cheers, Stephen Rothwell