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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20170308094951.qtvgv4x4bzjtqcoz@phenom.ffwll.local>
Date:   Wed, 8 Mar 2017 10:49:51 +0100
From:   Daniel Vetter <daniel@...ll.ch>
To:     Jani Nikula <jani.nikula@...ux.intel.com>
Cc:     Maxime Ripard <maxime.ripard@...e-electrons.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        linux-kernel@...r.kernel.org,
        DRI <dri-devel@...ts.freedesktop.org>,
        Chen-Yu Tsai <wens@...e.org>, linux-next@...r.kernel.org
Subject: Re: linux-next: build failure after merge of the sunxi tree

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