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 for Android: free password hash cracker in your pocket

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

Message-ID: <878togjhrl.fsf@intel.com>
Date:   Wed, 08 Mar 2017 10:26:54 +0200
From:   Jani Nikula <jani.nikula@...ux.intel.com>
To:     Maxime Ripard <maxime.ripard@...e-electrons.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     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 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.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center