[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAK8P3a0AqL1nZrmaBaHNJ0Nfji72Lm44DPPSoKzGFbd4FcQHFw@mail.gmail.com>
Date: Tue, 2 May 2017 10:55:10 +0200
From: Arnd Bergmann <arnd@...db.de>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Daniel Vetter <daniel@...ll.ch>, Olof Johansson <olof@...om.net>,
ARM <linux-arm-kernel@...ts.infradead.org>,
Dave Airlie <airlied@...ux.ie>,
Daniel Vetter <daniel.vetter@...ll.ch>,
Intel Graphics <intel-gfx@...ts.freedesktop.org>,
DRI <dri-devel@...ts.freedesktop.org>,
Linux-Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Logan Gunthorpe <logang@...tatee.com>,
Sumit Semwal <sumit.semwal@...aro.org>,
Jens Wiklander <jens.wiklander@...aro.org>
Subject: Re: linux-next: build failure after merge of the drm-misc tree
On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Daniel,
>
> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter <daniel@...ll.ch> 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
Powered by blists - more mailing lists