Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932387AbbDODDZ (ORCPT <rfc822;w@1wt.eu>);
	Tue, 14 Apr 2015 23:03:25 -0400
Received: from mail-la0-f49.google.com ([209.85.215.49]:33181 "EHLO
	mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753761AbbDODDS (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 14 Apr 2015 23:03:18 -0400
MIME-Version: 1.0
In-Reply-To: <20150414094017.GM6023@sirena.org.uk>
References: <20150409143309.3a1fac67@canb.auug.org.au>
	<20150409093556.GP6023@sirena.org.uk>
	<20150414094403.30126f2d@canb.auug.org.au>
	<20150414010706.GB29061@sonymobile.com>
	<20150414112241.3dbad71a@canb.auug.org.au>
	<20150414094017.GM6023@sirena.org.uk>
Date: Wed, 15 Apr 2015 13:03:16 +1000
Message-ID: <CAPM=9tx0-_Mi2nog_efasX92+yFvZ-Hf7a8A2GdM6SuhDdswsw@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the regulator tree
From: Dave Airlie <airlied@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
        Bjorn Andersson <bjorn.andersson@sonymobile.com>,
        Liam Girdwood <lgirdwood@gmail.com>,
        "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Hai Li <hali@codeaurora.org>, Rob Clark <robdclark@gmail.com>,
        Dave Airlie <airlied@linux.ie>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 979
Lines: 24

On 14 April 2015 at 19:40, Mark Brown <broonie@kernel.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@sonymobile.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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/