From patchwork Tue Dec 8 00:04:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11957163 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 33BBCC0018C for ; Tue, 8 Dec 2020 00:05:56 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED7DD23A04 for ; Tue, 8 Dec 2020 00:05:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED7DD23A04 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=b7ku+5LbwHgnCeH2a/0P53B1+jZysDtiVdLbey4MxwM=; b=vqH sjZ/qwU3e2qpNQOHZLPNQpocAKRElzmRy/U3zR2R8x5gTTZbobuXmfL+vXDgBvRID4Zf7Ffav1MI5 O1R8wH/qWjPsQowv+vo9zQyIEg/AJ+0epSs7tA8xLWJ+CSqNOB6wG5wl+9iicx59HIBEDPS/2v7eE 0ZDmTDJI61CLo5Tosb2dPztjR5vh1nUlaplDgMcNRzWrlLQKKFuX6WWwDfB6a+s4qpmm9K/WGBX6o 6O/UtkbbsMAt8zsk41tSBuiG3FDCCfGfuHPN3FwPzb81bw/bWn/HDoGTZgAgZDdPLTXOrxCo55QfQ p3LcCO837JeCae/1vgq3nVkOvNRqkjw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmQUg-00062Z-OR; Tue, 08 Dec 2020 00:04:38 +0000 Received: from ozlabs.org ([203.11.71.1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmQUd-00061U-DT for linux-arm-kernel@lists.infradead.org; Tue, 08 Dec 2020 00:04:37 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4CqgQR4Rhfz9sW0; Tue, 8 Dec 2020 11:04:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607385866; bh=19OrIeodFiMIQNQF+Sg6nJriKO1pUHSNuYeu7jcVYwU=; h=Date:From:To:Cc:Subject:From; b=S5ndaTCMWe8LZ4Y9MbkJj2Btd31XKWIW1/drGKuRNp7DM0Lfl8ry9NMpbX+EitFgo 3Ns4nRa2BvVgX1UVFbHdq8ArCToB/aMekWs6pywJGMhcJRUEQRYQvbjpPoR6Gg0OkU 8mPBeal+0ngnrovq3TnDGTaA4M7XO/SR1WAieYTO9C0TVGoOXyQi1m08gZt40KdFl4 sIX8hfp+eXbvjE5wM42o5UWFnToe3iO9LDpQck1cIR14qLHAVjFeexAl0eLQjL0z9c MSTHarNskH6G50HDQx2E10H0UmaJbV9wHu1VR1VfflM5OV2ycH5T0leyxO5q9nd687 Hkm+fZmbNDDuw== Date: Tue, 8 Dec 2020 11:04:13 +1100 From: Stephen Rothwell To: Mauro Carvalho Chehab , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Message-ID: <20201208110413.04400395@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201207_190435_704494_35555C37 X-CRM114-Status: GOOD ( 17.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jernej Skrabec , Mauro Carvalho Chehab , Linux Kernel Mailing List , Linux Next Mailing List , Maxime Ripard , Martin Cerveny , Hans Verkuil Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the v4l-dvb tree got a conflict in: drivers/staging/media/sunxi/cedrus/cedrus.c between commit: c6e95daab1cc ("media: cedrus: Remove the MBUS quirks") from the arm-soc tree and commits: 503dab0b8a56 ("media: cedrus: Register all codecs as capability") 68b4a01f88af ("media: cedrus: Make VP8 codec as capability") 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/staging/media/sunxi/cedrus/cedrus.c index d5fca10ea5b4,18d54f9fd715..000000000000 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c