On Fri, Oct 16, 2020 at 12:45 PM Miklos Szeredi <miklos@xxxxxxxxxx> wrote: [..] > > This is broken... it needs to be converted to 'struct range'. I'll take > > care of that when I respin the series. Sorry for the thrash it seems > > this is a new memremap_pages() user since the conversion patches > > landed. > > Hi Dan, > > I'd like to send this upstream and this conflict needs to be dealt > with some way or another. Can you send the correct fixup against > > git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next Sorry, I just circled back to this and found your for-next branch is already merged. The resolution looks good. Apologies for not taking a look earlier.