On Mon, Apr 24, 2023 at 11:40:25AM +0200, Lukas Bulwahn wrote: > It is easy to fix, adjust this one line to the renaming and 'select > ARCH_WANT_OPTIMIZE_VMEMMAP'. For now, I am just reporting to let you > know; probably, it is best to get a quick fix-up patch with -rc2, once > all the changes landed in -rc1. Actually, it's best that both parties who send a pull request to Linus note this collision and he can fix it in the merge commit.