Messages in this thread | | | Date | Wed, 15 Apr 2015 13:03:16 +1000 | Subject | Re: linux-next: build failure after merge of the regulator tree | From | Dave Airlie <> |
| |
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.
| |