| Message ID | 20230417152227.2603080-1-broonie@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2217895vqo;
Mon, 17 Apr 2023 08:42:31 -0700 (PDT)
X-Google-Smtp-Source:
AKy350aNkwuKdV+LFhoC/1ed6tTtHnzmLDeYMJFj0Nrksqr60Y/b4FyLHQJI7zjLW/c9K//Bsh3q
X-Received: by 2002:a05:6a20:7d88:b0:ef:f20b:2be9 with SMTP id
v8-20020a056a207d8800b000eff20b2be9mr3984891pzj.49.1681746150625;
Mon, 17 Apr 2023 08:42:30 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1681746150; cv=none;
d=google.com; s=arc-20160816;
b=c8PH4ZPiF0z09ufp/ORNq9orO7/0QibFsDtWXARyV7GjaO6BNguhdQSxuofAv6SYgl
bT5En0HwZscJKuTx7G8aczVVi/M8GfWMnhqTwmINcumQNXH/royE1deagNC91s4z/HoU
xqgpugKNNvEFCOqZJ2MwXyzEnyrxKfoRlbsbQRNz9/XRT6CWKRx597CAfD266Zk8t9ZO
mWHnYNnvhtA4bMaK1PQnEmcCOzmbQYyc1MKyQ0dE/SHQX0mNsKxn0n7rRJCpAnWL97MI
fpfTiVFHsasTPPMcMLywjHIn0MI6G+BK0fT/otAgHGw8xCWh5Gbp/Wej2KSIgc2NYZJ6
bsPA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:dkim-signature;
bh=BmoYzfPOLX0lsXutg1eITBgfa9SeCRcd7iMSKYxKBRE=;
b=tUTaGyjPIWiVoNGQvn4bPw3gbLCtmTWjQOqSt9bAHr9B8Gzt8bopVZdnyvWKVADbF7
wGOblVyXKlat/sZtjRyx3xX3F9EAA/r/u3aNiSXwb+9r2lRHFMwqMQi93tXucCxYyPlU
YVC1KzlwK1NEt5nzyHCGokzzYOZJIanWU1QfJwHIyj7G5KLh6OX+07BvmYbWaY6we+HM
yO4wJYa1XPrFW9ceML/EkCsuixBq2ghrKQmO1yq/Kn3PDX+3NYPSrI7vbfzA7/PNmxkq
B6hksvvi1V0/82OxLCc2i8JjyGd9Z0JBPDaV+q3INLOZDOISdb+FUeEcUpRErewgi5dL
Aemg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Msv80enb;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
y31-20020a634b1f000000b0050f8a43b1b9si11899529pga.187.2023.04.17.08.42.17;
Mon, 17 Apr 2023 08:42:30 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Msv80enb;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231195AbjDQPYj (ORCPT <rfc822;leviz.kernel.dev@gmail.com>
+ 99 others); Mon, 17 Apr 2023 11:24:39 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44530 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231176AbjDQPYZ (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 17 Apr 2023 11:24:25 -0400
Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3228410262;
Mon, 17 Apr 2023 08:23:30 -0700 (PDT)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by dfw.source.kernel.org (Postfix) with ESMTPS id BC86F61FF1;
Mon, 17 Apr 2023 15:22:34 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68587C433D2;
Mon, 17 Apr 2023 15:22:32 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1681744954;
bh=2iS+hQ1LA78BC7w3OziP9UD8SgJ+yICD0rVzKV1MhnY=;
h=From:To:Cc:Subject:Date:From;
b=Msv80enbQmM8W8qql8Ux3d4etvStWQMH7w3mE9jcMweBs//4DN5if+coNy+LhAL8/
9m0afJjlrAjH2gkoliKZ9Q2G2JuDFTVeCdKaiEH7aCXlQsPk5k2t2KDoUWGJzJwbaG
pKLuQg/TDQIQR3O0KFEq5u2Qe5R/ol+rNPMPHon2TA3shbw78RNqMv3h2QM16rpWUA
Qsn7oPcSP/mZljKzs7nvdl66SNEwUpAGcQVXp/lCutbFrn5zUBiGh4HBDW/513Bcvm
moCwo1bOWV7eCioZEM7Sz+WMhgsyNsMszEHtmNfGtxy4Y5H4JCQ7frkdKGVecesl6R
Z1SE8Fxg2zTwQ==
From: broonie@kernel.org
To: Joerg Roedel <joro@8bytes.org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Joerg Roedel <jroedel@suse.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robh@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Yong Wu <yong.wu@mediatek.com>
Subject: linux-next: manual merge of the iommu tree with the v4l-dvb-next tree
Date: Mon, 17 Apr 2023 16:22:27 +0100
Message-Id: <20230417152227.2603080-1-broonie@kernel.org>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1763438651704888789?=
X-GMAIL-MSGID: =?utf-8?q?1763438651704888789?=
|
| Series |
linux-next: manual merge of the iommu tree with the v4l-dvb-next tree
|
|
Commit Message
Mark Brown
April 17, 2023, 3:22 p.m. UTC
Hi all,
Today's linux-next merge of the iommu tree got conflicts in:
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
between commit:
0f4afd529224a ("media: Use of_property_present() for testing DT property presence")
from the v4l-dvb-next tree and commits:
aa0ee7b4d5221 ("media: mediatek: vcodec: Remove the setting for dma_mask")
7d35584d9c6d2 ("media: mtk-jpegdec: Remove the setting for dma_mask")
from the iommu tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
diff --cc drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
index 9ba5dc5df648d,11583405cf618..0000000000000
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
diff --cc drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
index 755f567b9e54f,50e5571608cdf..0000000000000
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
diff --cc drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c index 6c7c5f3648df8,9b96d24363119..0000000000000 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c