Re: linux-next: manual merge of the akpm-current tree with the hmm tree

From: Dan Williams
Date: Thu Jul 04 2019 - 19:30:11 EST


Guys, Andrew has kicked the subsection patches out of -mm because of
the merge conflicts. Can we hold off on the hmm cleanups for this
cycle?

On Thu, Jul 4, 2019 at 2:08 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi Jason,
>
> On Thu, 4 Jul 2019 13:28:41 +0000 Jason Gunthorpe <jgg@xxxxxxxxxxxx> wrote:
> >
> > BTW, do you use a script to get these conflicting patch commit ID
> > automatically? It is so helpful to have them.
>
> No, I just use gitk and a bit of searching. Though often there are not
> many possible commits to search.
>
> --
> Cheers,
> Stephen Rothwell