On Wed, 20 Sep 2017, Dave Airlie <airlied@xxxxxxxxx> wrote: > On 20 September 2017 at 15:43, Dave Airlie <airlied@xxxxxxxxx> wrote: >> On 20 September 2017 at 09:03, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote: >>> Hi Dave, >> >> Hi Rodrigo, >> >> This pull request is generated wrongly, it contains some commits from >> drm-next in it. > > Sorry contains some commits from drm-fixes in it. >> >> Please regenerate it, I'm assuming you generated against 4.14-rc1 and >> not against drm-next. > > not against drm-fixes :-) I believe the issue is that Rodrigo rebased drm-intel-fixes on top of drm-fixes, not Linus' tags like we've used to do this. Rodrigo, when you do this, you need to pass drm-fixes as the upstream for 'dim pull-request-fixes'. It defaults to Linus' tree for the fixes pulls. But going forward, I think we'll prefer Linus' tags as baseline for fixes pulls like before. And I think the lesson is to always have a sanity check glance at the shortlog. Anyway, I promised better docs for Rodrigo and Joonas before -rc1, my fail. BR, Jani. -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
