On Wed, Mar 08, 2017 at 10:26:54AM +0200, Jani Nikula wrote: > On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> wrote: > > I just rebased my tree on top of the latest drm-misc tag > > (drm-misc-next-2017-03-06). It should compile, and not have merge > > conflicts anymore. > > Conflicts happen. Rebasing should not be the standard operating > procedure for fixing them. I think for this one here it's ok, very early in the feature cycle, few patches, nasty conflict. But yeah the same thing right before the merge window opens wouldn't be cool. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
