From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: linux-next: build failure after merge of the drm-misc tree Date: Tue, 2 May 2017 10:55:10 +0200 Message-ID: References: <20170421121014.3ee14a83@canb.auug.org.au> <20170424112512.582d04da@canb.auug.org.au> <20170502082518.jdk5tqjhvlsqntny@phenom.ffwll.local> <20170502184132.2c1b0299@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from mail-io0-f193.google.com ([209.85.223.193]:36479 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750767AbdEBIzL (ORCPT ); Tue, 2 May 2017 04:55:11 -0400 In-Reply-To: <20170502184132.2c1b0299@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Daniel Vetter , Olof Johansson , ARM , Dave Airlie , Daniel Vetter , Intel Graphics , DRI , Linux-Next Mailing List , Linux Kernel Mailing List , Logan Gunthorpe , Sumit Semwal , Jens Wiklander On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell wrote: > Hi Daniel, > > On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter wrote: >> >> Since this is an all-new driver it might be best to stagger the pull >> requests and merge the new tee subsystem (or whatever it is) after drm? >> >> Not sure what to best do here ... > > This will merge via Dave, so Dave just needs to let Linus know that a > fix up is needed when this merges with the arm-soc stuff in Linus' tree. The TEE subsystem is currently on a separate branch by itself in arm-soc, so we could easily delay that until DRM is in, and point out the resolution here. Arnd