On Thu, 4 Jul 2019 at 07:32, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Hi Alex, > > On Wed, 3 Jul 2019 17:09:16 -0400 Alex Deucher <alexdeucher@xxxxxxxxx> wrote: > > > > Go ahead and respin your patch as per the suggestion above. then I > > can apply it I can either merge hmm into amd's drm-next or we can just > > provide the conflict fix patch whichever is easier. Which hmm branch > > is for 5.3? > > https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/?h=hmm > > Please do not merge the hmm tree into yours - especially if the > conflict comes down to just a few lines. Linus has addressed this in > the past. There is a possibility that he may take some objection to > the hmm tree (for example) and then your tree (and consequently the drm > tree) would also not be mergeable. > I'm fine with merging the hmm tree if Jason has a stable non-rebasing base. I'd rather merge into drm tree and then have amd backmerge if it we are doing it. But if we can just reduce the conflicts to a small amount it's easier for everyone to just do that. Dave. > Just supply Linus with a hint about the conflict resolution. > > -- > Cheers, > Stephen Rothwell > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel
