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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable 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 434C8C2BB48 for ; Mon, 14 Dec 2020 21:07:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E37A022522 for ; Mon, 14 Dec 2020 21:07:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503682AbgLNVGx (ORCPT ); Mon, 14 Dec 2020 16:06:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:39944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503637AbgLNVGl (ORCPT ); Mon, 14 Dec 2020 16:06:41 -0500 Date: Mon, 14 Dec 2020 22:05:54 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1607979959; bh=kYxvt5XZtu8HNBuiKTDtgnZwS6o+QdAyk43mKWgewHs=; h=From:To:Cc:Subject:In-Reply-To:References:From; b=cV75mcLMKa3HOy8fqzFsLZl77OILwX/xz2P1qGMyIJ6cmwhQra5MgCVN+r6qp60ny oUSFDG1SPh5soSckVEI6xaFvHJdSKr/CDi0Sq8ll3iHoJkqKDCifSHUZRb7erIHpby khiga1bN4KBYuDMfAhCoL8dYq6BLshY65UGA5sfVwLJaWpTFyOBrTuOUf3FfGtSo8M wL7dXpLGLnscYC55g9bxT8MHqbrvPQxOTMwkiii1mPA2L3Tfumgr9H7Lti+Pvb8aVy OZLxofGZwnE9EzRSDUrbI/kL65Mxi+GnDWy4uf1/FwZ+nMwPEwyog+8RI1/YhNFcxO ta/Rolcmigheg== From: Mauro Carvalho Chehab To: Stephen Rothwell , Olof Johansson , Arnd Bergmann Cc: ARM , Hans Verkuil , Jernej Skrabec , Linux Kernel Mailing List , Linux Next Mailing List , Martin Cerveny , Mauro Carvalho Chehab , Maxime Ripard Subject: Re: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Message-ID: <20201214220554.47a3709f@coco.lan> In-Reply-To: <20201215073037.5bb96437@canb.auug.org.au> References: <20201208110413.04400395@canb.auug.org.au> <20201215073037.5bb96437@canb.auug.org.au> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org HI Stephen/Arnd/Olof, Em Tue, 15 Dec 2020 07:30:37 +1100 Stephen Rothwell escreveu: > Hi all, > > On Tue, 8 Dec 2020 11:04:13 +1100 Stephen Rothwell wrote: > > > > 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. > > > > -- > > Cheers, > > Stephen Rothwell > > > > diff --cc drivers/staging/media/sunxi/cedrus/cedrus.c > > index d5fca10ea5b4,18d54f9fd715..000000000000 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus.c > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c > > @@@ -522,7 -584,11 +584,10 @@@ static const struct cedrus_variant sun5 > > > > static const struct cedrus_variant sun50i_h6_cedrus_variant = { > > .capabilities = CEDRUS_CAPABILITY_UNTILED | > > - CEDRUS_CAPABILITY_H265_DEC, > > + CEDRUS_CAPABILITY_MPEG2_DEC | > > + CEDRUS_CAPABILITY_H264_DEC | > > + CEDRUS_CAPABILITY_H265_DEC | > > + CEDRUS_CAPABILITY_VP8_DEC, > > - .quirks = CEDRUS_QUIRK_NO_DMA_OFFSET, > > .mod_rate = 600000000, > > }; > > > > Just a reminder that this conflict still exists. Thanks for the reminder! I ended forgetting about it. Last week was hard for me, as I had several things to solve before taking some vacations, including preparing for a talk on an user's group that happened last Saturday. In any case, Linus already pulled from my tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fab0fca1da5cdc48be051715cd9787df04fdce3a So, I guess the best would be to either let Linus know about that when he would be pulling from arm-soc, or to solve such conflict between upstream and arm-soc. As I'm in PTO those days, in order to avoid further conflicts with linux-next, I'll pull from Linus tree today. Thanks, Mauro 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=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable 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 08780C4361B for ; Mon, 14 Dec 2020 21:07:25 +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 862142251F for ; Mon, 14 Dec 2020 21:07:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 862142251F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7v3+xTwABsAjwnvi39AphJd0XxqFrbCmm+OZ5ZwPw+I=; b=YUaqdJxyjdxVv9y1BESlEh4Yh POB/jLPG3HmklIKjkJMtBiSxBvSrzYlM32Wx+eO7YQRB4NT4VCD/SbhhPYUHhrNeElQrQtL5r2VPE XhSHoyw/IK4RYBdYZCywgUhJNrQa6gefq3e+0IBIqT7nSGOHkkqcx8H0PsQn5UsU/WR1NZ6r/dNUy IxFssAN1n7w/UY+gMwxQ7jq17aj26F9ocKGbyWnYTDdc+HvMD4gmxugN0HmtDp+Td05SRll+V0P2y sykLDTEoRv0YNeg6dMUoveN/xjue3aZu9GSUHvSXHz9sYqHCXYMp6N7qbUZsbTVnuWybc8Cjopn9h 1Jnyc3TAw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kov2i-00081q-Dw; Mon, 14 Dec 2020 21:06:04 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kov2f-00080u-Dc for linux-arm-kernel@lists.infradead.org; Mon, 14 Dec 2020 21:06:02 +0000 Date: Mon, 14 Dec 2020 22:05:54 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1607979959; bh=kYxvt5XZtu8HNBuiKTDtgnZwS6o+QdAyk43mKWgewHs=; h=From:To:Cc:Subject:In-Reply-To:References:From; b=cV75mcLMKa3HOy8fqzFsLZl77OILwX/xz2P1qGMyIJ6cmwhQra5MgCVN+r6qp60ny oUSFDG1SPh5soSckVEI6xaFvHJdSKr/CDi0Sq8ll3iHoJkqKDCifSHUZRb7erIHpby khiga1bN4KBYuDMfAhCoL8dYq6BLshY65UGA5sfVwLJaWpTFyOBrTuOUf3FfGtSo8M wL7dXpLGLnscYC55g9bxT8MHqbrvPQxOTMwkiii1mPA2L3Tfumgr9H7Lti+Pvb8aVy OZLxofGZwnE9EzRSDUrbI/kL65Mxi+GnDWy4uf1/FwZ+nMwPEwyog+8RI1/YhNFcxO ta/Rolcmigheg== From: Mauro Carvalho Chehab To: Stephen Rothwell , Olof Johansson , Arnd Bergmann Subject: Re: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Message-ID: <20201214220554.47a3709f@coco.lan> In-Reply-To: <20201215073037.5bb96437@canb.auug.org.au> References: <20201208110413.04400395@canb.auug.org.au> <20201215073037.5bb96437@canb.auug.org.au> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201214_160601_606302_A3E3220D X-CRM114-Status: GOOD ( 24.72 ) 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 , ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org HI Stephen/Arnd/Olof, Em Tue, 15 Dec 2020 07:30:37 +1100 Stephen Rothwell escreveu: > Hi all, > > On Tue, 8 Dec 2020 11:04:13 +1100 Stephen Rothwell wrote: > > > > 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. > > > > -- > > Cheers, > > Stephen Rothwell > > > > diff --cc drivers/staging/media/sunxi/cedrus/cedrus.c > > index d5fca10ea5b4,18d54f9fd715..000000000000 > > --- a/drivers/staging/media/sunxi/cedrus/cedrus.c > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c > > @@@ -522,7 -584,11 +584,10 @@@ static const struct cedrus_variant sun5 > > > > static const struct cedrus_variant sun50i_h6_cedrus_variant = { > > .capabilities = CEDRUS_CAPABILITY_UNTILED | > > - CEDRUS_CAPABILITY_H265_DEC, > > + CEDRUS_CAPABILITY_MPEG2_DEC | > > + CEDRUS_CAPABILITY_H264_DEC | > > + CEDRUS_CAPABILITY_H265_DEC | > > + CEDRUS_CAPABILITY_VP8_DEC, > > - .quirks = CEDRUS_QUIRK_NO_DMA_OFFSET, > > .mod_rate = 600000000, > > }; > > > > Just a reminder that this conflict still exists. Thanks for the reminder! I ended forgetting about it. Last week was hard for me, as I had several things to solve before taking some vacations, including preparing for a talk on an user's group that happened last Saturday. In any case, Linus already pulled from my tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fab0fca1da5cdc48be051715cd9787df04fdce3a So, I guess the best would be to either let Linus know about that when he would be pulling from arm-soc, or to solve such conflict between upstream and arm-soc. As I'm in PTO those days, in order to avoid further conflicts with linux-next, I'll pull from Linus tree today. Thanks, Mauro _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel