linux-kernel - Re: linux-next: build failure after merge of the regulator 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: <CAPM=9tx0-_Mi2nog_efasX92+yFvZ-Hf7a8A2GdM6SuhDdswsw@mail.gmail.com>
Date:	Wed, 15 Apr 2015 13:03:16 +1000
From:	Dave Airlie <airlied@...il.com>
To:	Mark Brown <broonie@...nel.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Bjorn Andersson <bjorn.andersson@...ymobile.com>,
	Liam Girdwood <lgirdwood@...il.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Hai Li <hali@...eaurora.org>, Rob Clark <robdclark@...il.com>,
	Dave Airlie <airlied@...ux.ie>
Subject: Re: linux-next: build failure after merge of the regulator tree

On 14 April 2015 at 19:40, Mark Brown <broonie@...nel.org> wrote:
> On Tue, Apr 14, 2015 at 11:22:41AM +1000, Stephen Rothwell wrote:
>> On Mon, 13 Apr 2015 18:07:06 -0700 Bjorn Andersson <bjorn.andersson@...ymobile.com> wrote:
>
>> > Your patch looks correct and should preferrably be added to the drm
>> > tree, or the last patch in my series that drops the API wrapper should
>> > be held back until rc1(?)
>
>> It needs to be sent to Linus as a merge fix when the drm tree is merged.
>
> Or the DRM tree could pull my tree I guess - Rob/David, I can make a tag
> specifically for this branch if you like?

I can just backmerge Linus's tree before I send it to him, and stick
this patch on top.

seems like the best answer.

Dave.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/