On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Daniel,
>
> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter <daniel@xxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
