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 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A7D78C46467 for ; Tue, 3 Jan 2023 16:41:13 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 680EB7315; Tue, 3 Jan 2023 17:40:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 680EB7315 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1672764071; bh=BGgs+QYUOjIFHxW2yTZDRX9cwQNvq/RtUIGrPk5Dkro=; h=Date:Subject:To:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=AdwhlUCjZpP+lOnk3++Wu9g/4dbHoK7BhSyN3g3ah7iyFkvAhAs12kIDDq2gX4Tn2 4PJ1wE6xS92LBCC7VAD/X4EQ951/GIT9b9gkmPi735sXJqOOXWZtp5sfyrKmH8y5eh xQ/pj5q2gxgxiNdDyvbBV0yLP6r+OmYW2OzT7TvA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 11F90F803DC; Tue, 3 Jan 2023 17:40:21 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E473FF8047B; Tue, 3 Jan 2023 17:40:19 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by alsa1.perex.cz (Postfix) with ESMTP id F403AF803DC for ; Tue, 3 Jan 2023 17:40:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F403AF803DC Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 819861516; Tue, 3 Jan 2023 08:40:51 -0800 (PST) Received: from [10.1.196.40] (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 804AE3F71A; Tue, 3 Jan 2023 08:40:07 -0800 (PST) Message-ID: <832f3200-77ac-1ee0-e1b5-5f56353cba36@arm.com> Date: Tue, 3 Jan 2023 16:39:59 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper Content-Language: en-GB To: Maxime Ripard References: <20221222233759.1934852-1-sean.anderson@seco.com> <20221222233759.1934852-3-sean.anderson@seco.com> <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com> <20230103161550.4tui3ihl65olvkd7@houat> From: Robin Murphy In-Reply-To: <20230103161550.4tui3ihl65olvkd7@houat> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Daniel Vetter , Liam Girdwood , Sean Anderson , Will Deacon , Joerg Roedel , Takashi Iwai , Maarten Lankhorst , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, iommu@lists.linux.dev, Mark Brown , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Thomas Zimmermann , Matthias Brugger , David Airlie , Yong Wu Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On 03/01/2023 4:15 pm, Maxime Ripard wrote: > Hi Robin, > > On Tue, Jan 03, 2023 at 01:01:07PM +0000, Robin Murphy wrote: >> Hi Sean, >> >> On 22/12/2022 11:37 pm, Sean Anderson wrote: >>> Convert users of component_match_add_release with component_release_of >>> and component_compare_of to component_match_add_of. >>> >>> Signed-off-by: Sean Anderson >>> Acked-by: Mark Brown >>> --- >>> >>> Changes in v2: >>> - Split off from helper addition >>> >>> drivers/iommu/mtk_iommu.c | 3 +-- >>> drivers/iommu/mtk_iommu_v1.c | 3 +-- >>> sound/soc/codecs/wcd938x.c | 6 ++---- >>> 3 files changed, 4 insertions(+), 8 deletions(-) >>> >>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c >>> index 2ab2ecfe01f8..483b7a9e4410 100644 >>> --- a/drivers/iommu/mtk_iommu.c >>> +++ b/drivers/iommu/mtk_iommu.c >>> @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m >>> } >>> data->larb_imu[id].dev = &plarbdev->dev; >>> - component_match_add_release(dev, match, component_release_of, >>> - component_compare_of, larbnode); >>> + component_match_add_of(dev, match, larbnode); >> >> I've long since given up trying to make sense of how the DRM tree works, but >> the conflicting change is definitely already in mainline: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 > > As far as I can see, that patch doesn't affect DRM at all, and the > commit you pointed to doesn't either, nor has it been merged through the > DRM tree. Right it doesn't affect DRM, and was merged via the IOMMU tree, but it does affect *this* patch, which Sean has based on a drm-next branch that seemingly still wasn't up to date with 6.2-rc1 at the time. Since v2 had already been posted, it seemed like a bright idea to comment here to clarify that it was still relevant, rather than bumping the old thread to reply directly. Apologies for any confusion. In practical terms I think it's merely a case of dropping this hunk; the other one in mtk_iommu_v1.c looks fine to me. Cheers, Robin. > Can you expand a bit on how we're involved in this, what we should > clarify or help with? > > Maxime From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 89CE0362 for ; Tue, 3 Jan 2023 16:40:10 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 819861516; Tue, 3 Jan 2023 08:40:51 -0800 (PST) Received: from [10.1.196.40] (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 804AE3F71A; Tue, 3 Jan 2023 08:40:07 -0800 (PST) Message-ID: <832f3200-77ac-1ee0-e1b5-5f56353cba36@arm.com> Date: Tue, 3 Jan 2023 16:39:59 +0000 Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper Content-Language: en-GB To: Maxime Ripard Cc: Sean Anderson , David Airlie , Daniel Vetter , Maarten Lankhorst , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mark Brown , Jaroslav Kysela , Joerg Roedel , Liam Girdwood , Matthias Brugger , Takashi Iwai , Will Deacon , Yong Wu , alsa-devel@alsa-project.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org References: <20221222233759.1934852-1-sean.anderson@seco.com> <20221222233759.1934852-3-sean.anderson@seco.com> <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com> <20230103161550.4tui3ihl65olvkd7@houat> From: Robin Murphy In-Reply-To: <20230103161550.4tui3ihl65olvkd7@houat> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 03/01/2023 4:15 pm, Maxime Ripard wrote: > Hi Robin, > > On Tue, Jan 03, 2023 at 01:01:07PM +0000, Robin Murphy wrote: >> Hi Sean, >> >> On 22/12/2022 11:37 pm, Sean Anderson wrote: >>> Convert users of component_match_add_release with component_release_of >>> and component_compare_of to component_match_add_of. >>> >>> Signed-off-by: Sean Anderson >>> Acked-by: Mark Brown >>> --- >>> >>> Changes in v2: >>> - Split off from helper addition >>> >>> drivers/iommu/mtk_iommu.c | 3 +-- >>> drivers/iommu/mtk_iommu_v1.c | 3 +-- >>> sound/soc/codecs/wcd938x.c | 6 ++---- >>> 3 files changed, 4 insertions(+), 8 deletions(-) >>> >>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c >>> index 2ab2ecfe01f8..483b7a9e4410 100644 >>> --- a/drivers/iommu/mtk_iommu.c >>> +++ b/drivers/iommu/mtk_iommu.c >>> @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m >>> } >>> data->larb_imu[id].dev = &plarbdev->dev; >>> - component_match_add_release(dev, match, component_release_of, >>> - component_compare_of, larbnode); >>> + component_match_add_of(dev, match, larbnode); >> >> I've long since given up trying to make sense of how the DRM tree works, but >> the conflicting change is definitely already in mainline: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 > > As far as I can see, that patch doesn't affect DRM at all, and the > commit you pointed to doesn't either, nor has it been merged through the > DRM tree. Right it doesn't affect DRM, and was merged via the IOMMU tree, but it does affect *this* patch, which Sean has based on a drm-next branch that seemingly still wasn't up to date with 6.2-rc1 at the time. Since v2 had already been posted, it seemed like a bright idea to comment here to clarify that it was still relevant, rather than bumping the old thread to reply directly. Apologies for any confusion. In practical terms I think it's merely a case of dropping this hunk; the other one in mtk_iommu_v1.c looks fine to me. Cheers, Robin. > Can you expand a bit on how we're involved in this, what we should > clarify or help with? > > Maxime 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18422C4708D for ; Tue, 3 Jan 2023 18:19:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SwNOaNkC1J4h1yL+HpGwnfvj+/lut+zcXlJG6ZUztQE=; b=nkZzb+CJfaFrD/ hqF3IWVpDD6nyJda/3XQU7wZMXHw0XyELN87hfZU6SZL5DE9bsTVvtmTTISldq5A+HPs7frTEk6xA m3tKKKIqh8VmOxVy3nhWjPv+rCfd1kBOCsg32SBQBp9d8rBKYnwttrP0B8OwErVe9GmaMl8wUhHzw zhbv6uGgjKG5Mm7eRcoAogh+6ED6BrKH9vXfaDWvYrboKuCChl1xihmkHQJBgD57TQbxrnC97aLeT OAXjvvwXglRjW1/b9OrFebEZRPToZM4OLNa88HiyOSLYckbpcCRQxLbJqgE8GgEUe6f5PI8aKfURh tWRkGwcHV4k+xZ7sCJyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pClrA-003nkB-Cc; Tue, 03 Jan 2023 18:17:49 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCkKi-0030zV-6s; Tue, 03 Jan 2023 16:40:14 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 819861516; Tue, 3 Jan 2023 08:40:51 -0800 (PST) Received: from [10.1.196.40] (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 804AE3F71A; Tue, 3 Jan 2023 08:40:07 -0800 (PST) Message-ID: <832f3200-77ac-1ee0-e1b5-5f56353cba36@arm.com> Date: Tue, 3 Jan 2023 16:39:59 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper Content-Language: en-GB To: Maxime Ripard Cc: Sean Anderson , David Airlie , Daniel Vetter , Maarten Lankhorst , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mark Brown , Jaroslav Kysela , Joerg Roedel , Liam Girdwood , Matthias Brugger , Takashi Iwai , Will Deacon , Yong Wu , alsa-devel@alsa-project.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org References: <20221222233759.1934852-1-sean.anderson@seco.com> <20221222233759.1934852-3-sean.anderson@seco.com> <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com> <20230103161550.4tui3ihl65olvkd7@houat> From: Robin Murphy In-Reply-To: <20230103161550.4tui3ihl65olvkd7@houat> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230103_084012_402233_1BD8A1E5 X-CRM114-Status: GOOD ( 21.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 03/01/2023 4:15 pm, Maxime Ripard wrote: > Hi Robin, > > On Tue, Jan 03, 2023 at 01:01:07PM +0000, Robin Murphy wrote: >> Hi Sean, >> >> On 22/12/2022 11:37 pm, Sean Anderson wrote: >>> Convert users of component_match_add_release with component_release_of >>> and component_compare_of to component_match_add_of. >>> >>> Signed-off-by: Sean Anderson >>> Acked-by: Mark Brown >>> --- >>> >>> Changes in v2: >>> - Split off from helper addition >>> >>> drivers/iommu/mtk_iommu.c | 3 +-- >>> drivers/iommu/mtk_iommu_v1.c | 3 +-- >>> sound/soc/codecs/wcd938x.c | 6 ++---- >>> 3 files changed, 4 insertions(+), 8 deletions(-) >>> >>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c >>> index 2ab2ecfe01f8..483b7a9e4410 100644 >>> --- a/drivers/iommu/mtk_iommu.c >>> +++ b/drivers/iommu/mtk_iommu.c >>> @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m >>> } >>> data->larb_imu[id].dev = &plarbdev->dev; >>> - component_match_add_release(dev, match, component_release_of, >>> - component_compare_of, larbnode); >>> + component_match_add_of(dev, match, larbnode); >> >> I've long since given up trying to make sense of how the DRM tree works, but >> the conflicting change is definitely already in mainline: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 > > As far as I can see, that patch doesn't affect DRM at all, and the > commit you pointed to doesn't either, nor has it been merged through the > DRM tree. Right it doesn't affect DRM, and was merged via the IOMMU tree, but it does affect *this* patch, which Sean has based on a drm-next branch that seemingly still wasn't up to date with 6.2-rc1 at the time. Since v2 had already been posted, it seemed like a bright idea to comment here to clarify that it was still relevant, rather than bumping the old thread to reply directly. Apologies for any confusion. In practical terms I think it's merely a case of dropping this hunk; the other one in mtk_iommu_v1.c looks fine to me. Cheers, Robin. > Can you expand a bit on how we're involved in this, what we should > clarify or help with? > > Maxime _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CDD2BC46467 for ; Tue, 3 Jan 2023 16:40:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9377A10E26E; Tue, 3 Jan 2023 16:40:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by gabe.freedesktop.org (Postfix) with ESMTP id C651510E26E for ; Tue, 3 Jan 2023 16:40:10 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 819861516; Tue, 3 Jan 2023 08:40:51 -0800 (PST) Received: from [10.1.196.40] (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 804AE3F71A; Tue, 3 Jan 2023 08:40:07 -0800 (PST) Message-ID: <832f3200-77ac-1ee0-e1b5-5f56353cba36@arm.com> Date: Tue, 3 Jan 2023 16:39:59 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper Content-Language: en-GB To: Maxime Ripard References: <20221222233759.1934852-1-sean.anderson@seco.com> <20221222233759.1934852-3-sean.anderson@seco.com> <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com> <20230103161550.4tui3ihl65olvkd7@houat> From: Robin Murphy In-Reply-To: <20230103161550.4tui3ihl65olvkd7@houat> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Liam Girdwood , Sean Anderson , Will Deacon , Joerg Roedel , Takashi Iwai , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Jaroslav Kysela , iommu@lists.linux.dev, Mark Brown , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Thomas Zimmermann , Matthias Brugger , Yong Wu Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 03/01/2023 4:15 pm, Maxime Ripard wrote: > Hi Robin, > > On Tue, Jan 03, 2023 at 01:01:07PM +0000, Robin Murphy wrote: >> Hi Sean, >> >> On 22/12/2022 11:37 pm, Sean Anderson wrote: >>> Convert users of component_match_add_release with component_release_of >>> and component_compare_of to component_match_add_of. >>> >>> Signed-off-by: Sean Anderson >>> Acked-by: Mark Brown >>> --- >>> >>> Changes in v2: >>> - Split off from helper addition >>> >>> drivers/iommu/mtk_iommu.c | 3 +-- >>> drivers/iommu/mtk_iommu_v1.c | 3 +-- >>> sound/soc/codecs/wcd938x.c | 6 ++---- >>> 3 files changed, 4 insertions(+), 8 deletions(-) >>> >>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c >>> index 2ab2ecfe01f8..483b7a9e4410 100644 >>> --- a/drivers/iommu/mtk_iommu.c >>> +++ b/drivers/iommu/mtk_iommu.c >>> @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m >>> } >>> data->larb_imu[id].dev = &plarbdev->dev; >>> - component_match_add_release(dev, match, component_release_of, >>> - component_compare_of, larbnode); >>> + component_match_add_of(dev, match, larbnode); >> >> I've long since given up trying to make sense of how the DRM tree works, but >> the conflicting change is definitely already in mainline: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 > > As far as I can see, that patch doesn't affect DRM at all, and the > commit you pointed to doesn't either, nor has it been merged through the > DRM tree. Right it doesn't affect DRM, and was merged via the IOMMU tree, but it does affect *this* patch, which Sean has based on a drm-next branch that seemingly still wasn't up to date with 6.2-rc1 at the time. Since v2 had already been posted, it seemed like a bright idea to comment here to clarify that it was still relevant, rather than bumping the old thread to reply directly. Apologies for any confusion. In practical terms I think it's merely a case of dropping this hunk; the other one in mtk_iommu_v1.c looks fine to me. Cheers, Robin. > Can you expand a bit on how we're involved in this, what we should > clarify or help with? > > Maxime