From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751636AbcF2Vgt (ORCPT <rfc822;w@1wt.eu>);
	Wed, 29 Jun 2016 17:36:49 -0400
Received: from ozlabs.org ([103.22.144.67]:56856 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751376AbcF2Vgs (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 29 Jun 2016 17:36:48 -0400
Date: Thu, 30 Jun 2016 07:36:44 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>
Cc: David Airlie <airlied@linux.ie>, Mark Brown <broonie@kernel.org>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        Jie Qiu <jie.qiu@mediatek.com>, Philipp Zabel <p.zabel@pengutronix.de>,
        Junzhi Zhao <junzhi.zhao@mediatek.com>,
        Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
        alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm: mediatek: fix prototypes after API change
Message-ID: <20160630073644.0623b607@canb.auug.org.au>
In-Reply-To: <20160629145129.315931-1-arnd@arndb.de>
References: <20160629145129.315931-1-arnd@arndb.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Arnd,

On Wed, 29 Jun 2016 16:51:29 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> The newly added mediatek HDMI driver clashes with an API change
> for struct hdmi_codec_ops, causing an 'allmodconfig' build to fail:
> 
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> 
> This changes the API accordingly for the mediatek driver.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support")
> Fixes: efc9194bcff8 ("ASoC: hdmi-codec: callback function will be called with private data")
> ---
> The new driver is currently part of Dave Airlie's drm-next tree,
> while the API change is in Mark Brown's asoc-next tree, so my
> fix has to be done on top of both.

Thanks for sorting this out.

> I can see two ways out of this:
> 
> a) Stephen Rothwell could add my fixup on top of linux-next
>    as a merge fix, and the fix gets sent to Linus Torvalds along
>    with the second of the two branches

I'll do this today, unless someone does the other.

-- 
Cheers,
Stephen Rothwell