Subject: Re: linux-next: build failure after merge of the sunxi tree

From: Jani Nikula <[email-masked]>
Date: Wed, 08 Mar 2017 10:26:54 +0200

On Tue, 07 Mar 2017, Maxime Ripard <[email-masked]> 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.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email-masked]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx