On Thu, Nov 04, 2021 at 04:37:25PM -0700, Linus Torvalds wrote: > On Thu, Nov 4, 2021 at 3:09 PM Linus Torvalds > <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > If (a) works, but (b) still fails, then it must be some odd > > interaction issug withs-----ing else. Which sounds unlikely, since I > > don't think we really had anything that should affect kmap or anything > > in this area, but who knows... > > And bisection ends up perhaps somewhat painful, but sounds like the > way to go if there's no other path forward. Just to give an update, I tested several merge commits and the btrfs merge is the first bad (037c50bfbeb33b4c). Last good is the one right before that, 9c6e8d52a7299 Merge tag 'exfat-for-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat (plus the fixup to make it compile e66435936756d9bce) The remaining test to do is the merge conflict resolved by me, as you suggested.