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] [day] [month] [year] [list]

Date:	Thu, 09 Jun 2016 15:43:48 -0700
From:	Kevin Hilman <khilman@...libre.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> 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.

Yup, I'll work this out with Philipp.

Kevin