On Thu, Sep 24, 2020 at 3:40 AM Williams, Dan J
<dan.j.williams@xxxxxxxxx> wrote:
>
> On Tue, 2020-09-08 at 20:09 +1000, Stephen Rothwell wrote:
[...]
> > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > Date: Tue, 8 Sep 2020 20:00:20 +1000
> > Subject: [PATCH] merge fix up for "mm/memremap_pages: convert to
> > 'struct
> > range'"
> >
> > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > ---
> > drivers/xen/unpopulated-alloc.c | 15 +++++++++------
> > fs/fuse/virtio_fs.c | 3 +--
> > 2 files changed, 10 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/xen/unpopulated-alloc.c
> > b/drivers/xen/unpopulated-alloc.c
> > index 3b98dc921426..9fa7ce330628 100644
> > --- a/drivers/xen/unpopulated-alloc.c
> > +++ b/drivers/xen/unpopulated-alloc.c
> > @@ -18,6 +18,7 @@ static unsigned int list_count;
> > static int fill_list(unsigned int nr_pages)
> > {
> > struct dev_pagemap *pgmap;
> > + struct resource res;
> > void *vaddr;
> > unsigned int i, alloc_pages = round_up(nr_pages,
> > PAGES_PER_SECTION);
> > int ret;
> > @@ -27,10 +28,10 @@ static int fill_list(unsigned int nr_pages)
> > return -ENOMEM;
> >
> > pgmap->type = MEMORY_DEVICE_GENERIC;
> > - pgmap->res.name = "Xen scratch";
> > - pgmap->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
>
> 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
?
Thanks,
Miklos
