linux-kernel - Re: linux-next: build failure after merge of the amlogic 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] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 6 Jun 2016 14:02:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kevin Hilman <khilman@...libre.com>
Cc:	linux-next@...r.kernel.org, lkml <linux-kernel@...r.kernel.org>,
	Neil Armstrong <narmstrong@...libre.com>,
	Philipp Zabel <p.zabel@...gutronix.de>
Subject: Re: linux-next: build failure after merge of the amlogic tree

Hi Kevin,

On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman <khilman@...libre.com> wrote:
>
> Not forgotten, but merged through Philip's reset tree, which I thought
> was already in linux-next.  Sorry about that.

It may well be, but we dislike implicit dependencies between trees ...
it makes the merge order matter :-(  What you should have is a common
non-rebasing branch that both trees merge.

It also means that your for-next branch, on its own, will get this
build failure as well ...

-- 
Cheers,
Stephen Rothwell