Re: linux-next: build failure after merge of the sunxi tree
From: Jani Nikula
Date: Wed Mar 08 2017 - 03:28:53 EST
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.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center