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

From	Daniel Vetter <daniel@ffwll.ch>
Newsgroups	linux.kernel
Subject	Re: linux-next: build failure after merge of the sunxi tree
Date	2017-03-08 11:30 +0100
Message-ID	<tiH0Z-5e8-7@gated-at.bofh.it> (permalink)
References	<tieV3-1UI-1@gated-at.bofh.it> <tiv9v-5b2-3@gated-at.bofh.it> <tiF8S-3JU-17@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Wed, Mar 08, 2017 at 10:26:54AM +0200, Jani Nikula wrote:
> On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> 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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the sunxi tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-07 05:30 +0100
  Re: linux-next: build failure after merge of the sunxi tree Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-03-07 22:50 +0100
    Re: linux-next: build failure after merge of the sunxi tree Jani Nikula <jani.nikula@linux.intel.com> - 2017-03-08 09:30 +0100
      Re: linux-next: build failure after merge of the sunxi tree Daniel Vetter <daniel@ffwll.ch> - 2017-03-08 11:30 +0100

csiph-web