On Thu, Jul 04, 2019 at 11:01:33PM +1000, Stephen Rothwell wrote:
> Hi Jason,
>
> On Thu, 4 Jul 2019 12:55:43 +0000 Jason Gunthorpe <j...@mellanox.com> wrote:
> >
> > On Thu, Jul 04, 2019 at 08:55:36PM +1000, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict in:
> > >
> > > mm/memory_hotplug.c
> > >
> > > between commit:
> > >
> > > 514caf23a70f ("memremap: replace the altmap_valid field with a
> > > PGMAP_ALTMAP_VALID flag")
> > >
> > > from the hmm tree and commit:
> > >
> > > db30f881e2d7 ("mm/hotplug: kill is_dev_zone() usage in
> > > __remove_pages()")
> >
> > There must be another commit involved for the 'unsigned long nr,
> > start_sec, end_sec;' lines..
>
> Yeah, there was, but that didn't actually create a conflict. That hunk
> is only there because I removed the initialisation of map_offset.
BTW, do you use a script to get these conflicting patch commit ID
automatically? It is so helpful to have them.
Jason
