Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp995313rwb; Tue, 27 Sep 2022 07:11:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Kfn/aIKwbtjrW97LcvRLPnNT/vrnygi5RE2/CHPal1VMGzGjE3dcqr+pPzMjl0tOd06Cj X-Received: by 2002:a17:907:7638:b0:76f:cad4:f176 with SMTP id jy24-20020a170907763800b0076fcad4f176mr23388158ejc.647.1664287897982; Tue, 27 Sep 2022 07:11:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664287897; cv=none; d=google.com; s=arc-20160816; b=B7/ZaP120W2IkgsOK2FrKwKHs6zEJpih3MA4MsQYB/Ek91dOty0xALhYZhsoVdCzku nh8lkD9lnorHSgh3oiAmSOA8YO37QCnagEkTg/01OnmpB47gc2mOdAoQguG/VG4wxgXD L3wrcrYcf03f94tYDXzguJGmM+EHfIk9FAOq3XP4mxepKg6e4JGBGB7E7k3uTSkUrzqC Ig68OeEOC8NWWN/K+2XSV14yg4Sxx3lqAwvnrxSU89SqU58uwl5rkjmWjg8PMqC9P24s MU1Ac2PZREVUXLWuY0Rw8vRFo342QZp1ZNQrAE+nVuvbir0UxlH1/6yRSgQX9FsH3XA9 MkUg== 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=bMPADVjoQuuSIPfoWBjpfNxtPk9d6hDWTFfhUB44Loo=; b=DX217du/V5pbAnu/W95n2sV9hGatiWr/TwaVDGj92axmgi5RjGEzN43hC9EFs0qYzL srpLN+LEPCqpuUdZDOJjjBRYsKy055DSRJMzeVLrAvM+zqjjbuGMTulPM3JoobReKdqE aIL9W5QwC8ttfgUaySb8fmHeZMIWRxTntXP8t8oWK2yYcY4tVCzRR5h1/2wZgcn1vXFT cqVXPOFPYHJZ8DObdZvZ18F5ehp8QQz4Tox2zrea1rrLA28RQP3QozoI5laQNQxT6FXj zcJ6pknplugYd6J6jnJGTiTggKq98uXh6k8iITW3BLnCL9ruVJDOLUWl1WjUDsjqXLEK 7jjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DWXxMx62; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hr38-20020a1709073fa600b007867dcd3ee8si1466776ejc.810.2022.09.27.07.11.01; Tue, 27 Sep 2022 07:11:37 -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=DWXxMx62; 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 S232324AbiI0Me0 (ORCPT + 99 others); Tue, 27 Sep 2022 08:34:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232330AbiI0MeW (ORCPT ); Tue, 27 Sep 2022 08:34:22 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C247AE9CD; Tue, 27 Sep 2022 05:34:21 -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 ams.source.kernel.org (Postfix) with ESMTPS id 2BC89B81A9A; Tue, 27 Sep 2022 12:34:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 620CAC433D6; Tue, 27 Sep 2022 12:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664282058; bh=Awh1GCPS8AJJDjRzu2ULEBsb4bUujF+ykG7UzU2NEF0=; h=From:To:Cc:Subject:Date:From; b=DWXxMx62LB1ytHShijY26hMFrjt81AtfXpFEavkdsCV/Gu7zY4I2gWwSCvntekLes KIh7gweOm8Pp9HzN25c76AULLKLD4aIWGtc4zBGxiWw7/sluSApomrtlX6mdq9q7Bi X50l/5iVHxiraO3ekt6iz05+OwCB9UUm13YMibcQcPQ5u2nfTh7DhLDb9CCLy+MGes ZIR5zIINJGaGzV6lfPlGkggvqDLAKR7KaspxCqEM1MWaP//UbLFC0iXWu0dck62hWQ ZYqWVewDlYg7N2Rm2GkA5SBYVtzEInQRMnx87+sQhN+MxOO/gbnPRWpDn+8Xnmjj+T 5atY3dSFFzITw== From: broonie@kernel.org To: Mauro Carvalho Chehab Cc: Hans Verkuil , Irui Wang , Linux Kernel Mailing List , Linux Next Mailing List , =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= Subject: linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree Date: Tue, 27 Sep 2022 13:34:10 +0100 Message-Id: <20220927123410.342690-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.2 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 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: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the v4l-dvb tree got a conflict in: drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c between commit: a2d2e593d39bc ("media: mediatek: vcodec: Drop platform_get_resource(IORESOURCE_IRQ)") from the v4l-dvb-fixes tree and commit: 223afdf9caa07 ("media: mediatek: vcodec: Remove encoder driver get IRQ resource") from the v4l-dvb 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. diff --cc drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c index d2f5f30582a9c,0abe1dac75b3a..0000000000000 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c