On Mon, Sep 16, 2019 at 11:12:03PM +0100, Mark Brown wrote:
> On Mon, Sep 16, 2019 at 01:51:15PM -0700, Nick Desaulniers wrote:
>
> > + Mark
> > I think this was a result of the resolved merge conflict.  See the
> > -next only commit titled:
> >     Merge remote-tracking branch 'drm/drm-next'

> Yes, the DRM and the Kbuild people really need to coordinate with each
> other here I fear, it's pretty bad that stuff like this has to be done
> in a merge at all :/ The fact that make doesn't detect a missing endif
> is also concerning.

Applied now, thanks Xinpeng.