From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26385C4360C for ; Tue, 8 Oct 2019 07:56:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F36B6206BB for ; Tue, 8 Oct 2019 07:56:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730419AbfJHH4g (ORCPT ); Tue, 8 Oct 2019 03:56:36 -0400 Received: from lb2-smtp-cloud8.xs4all.net ([194.109.24.25]:46433 "EHLO lb2-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730309AbfJHH4g (ORCPT ); Tue, 8 Oct 2019 03:56:36 -0400 Received: from [IPv6:2001:983:e9a7:1:a406:d42:889e:ff00] ([IPv6:2001:983:e9a7:1:a406:d42:889e:ff00]) by smtp-cloud8.xs4all.net with ESMTPA id HkMBiUPk8op0AHkMCiKhZ0; Tue, 08 Oct 2019 09:56:34 +0200 Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI , Mauro Carvalho Chehab Cc: Linux Next Mailing List , Linux Kernel Mailing List References: <20191008103045.2d4711e2@canb.auug.org.au> From: Hans Verkuil Message-ID: <225b19dd-a0bb-37a0-afbd-14acd5067521@xs4all.nl> Date: Tue, 8 Oct 2019 09:56:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191008103045.2d4711e2@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfNHyCzjZ5wPea/gAo1szz4vcI4XTrIQTlvprro1WK/gbn2HoolZbxpzQpvlFraBU2vkc7+nASMtkUdwCbT7DAIgJeju6qmqsvdJOR6Rreu9wHkHHzfgv Ya8JLTzXp+JldA4phq6VLCGKCverlqvgHwLNSpOlUS4zRgmCQmFgPfpIrUQKb8PNhLGznZjL3rd6LjyAAdgQ/aAS30o13V1WfBF5A1tmmSJRANRrjSyhMRPK w46UIZ5aqONCtdaZW13yu86Gut4PdizoYl5HOOCugY9Gmr9a8E71R7c+9we8ukMSh/DAAO3we+sMBH1mfd6x2IIVaOf+r6kHaH2YoRBX8IEKwFPsW6vpxFpd LpKTsBseU97LaiZk0PwIAY16x8w41nBzOLOjetu6vF6Ml/K69GNtTRm+nVufE9DgmNYPBoWJ1oQk9I+DW7LZ6SdLmyOIL1co9aRgw01zi5ck1KvEvzVTLQaG rxQYPAGHP5yLSD5vXEhWVgX3JAc+TA37z8sCzQ== Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On 10/8/19 1:30 AM, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > > Caused by commit > > 10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()") > > interacting with commit > > 7e86efa2ff03 ("media: cec-gpio: add notifier support") > > form the v4l-dvb tree. > > I have applied the following merge fix patch. That's the correct fix, thank you! Regards, Hans > > From: Stephen Rothwell > Date: Tue, 8 Oct 2019 10:26:05 +1100 > Subject: [PATCH] cec: fix up for "cec: add cec_adapter to > cec_notifier_cec_adap_unregister()" > > Signed-off-by: Stephen Rothwell > --- > drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c > index 7be91e712c4a..42d2c2cd9a78 100644 > --- a/drivers/media/platform/cec-gpio/cec-gpio.c > +++ b/drivers/media/platform/cec-gpio/cec-gpio.c > @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev) > return 0; > > unreg_notifier: > - cec_notifier_cec_adap_unregister(cec->notifier); > + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap); > del_adap: > cec_delete_adapter(cec->adap); > return ret; > @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev) > { > struct cec_gpio *cec = platform_get_drvdata(pdev); > > - cec_notifier_cec_adap_unregister(cec->notifier); > + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap); > cec_unregister_adapter(cec->adap); > return 0; > } >