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=-7.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 107C0C433E1 for ; Thu, 25 Mar 2021 08:15:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6EA061A14 for ; Thu, 25 Mar 2021 08:15:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbhCYIOk (ORCPT ); Thu, 25 Mar 2021 04:14:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbhCYIOH (ORCPT ); Thu, 25 Mar 2021 04:14:07 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52919C06174A for ; Thu, 25 Mar 2021 01:14:07 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id w3so1459834ejc.4 for ; Thu, 25 Mar 2021 01:14:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=78aguTeECvUqJlFCjkOA3FPCTCA4cU4wQo18ZlFqVds=; b=A7YyUkwtr95GFkpeaWC4lArNds0PM2j+ltyi94/BVLKquE2TPOuZoUIXYvTSWNp9yy I8wY5UUIXbbJepSAEs0aG4Cx1UrU4YNSmKKTbyTZ/hQRQ3/mg6tY/OL0dFumP/mgMOOj ktomNhRkhvDRI86UBoXPx2nczQ0dp9K+79Lmd6OVSTJUKeLAxQ5WZkC1Es9f6NJxi5+k 3V3zpH8sUBYfhDsoef/Gn7JwUtYcxLjLuOVMtLJHIGor4cLhJT7CurAQ4T6H2pKJodQn Mq9hz7cWghbRpCEcKp9rHcDca1KvfK+oiFKBopJhojtquG8C9W4p2u1vzy9yt2pNKwBC YzeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=78aguTeECvUqJlFCjkOA3FPCTCA4cU4wQo18ZlFqVds=; b=a9c0MuOwP4qCwtvc2sh+eiE18jyC3BikXxLttXyvV/8y5rs6bxx1zwPhEdrqUAg7e4 E2aa4tlIAG2i/+ShQloCH13IZ+Ah7Q2y/VaW8Ab2M/kv07tK9EFOTzE3KYGDH69ALiAt ieMgnbvobRjciUT4o1HKZ0ngHIXDw7nn/RtoLwRQukkPYMh+fenjGb8Dv6Go6g4j9HKv WPMXyiA5fmxgOzx032MqT2TaNR0oYKnFiRR19fFWb078F895+s9EYuuVydK1C+h/2bzN ookM/F3ijxPJ0NF4cmkxK83lrCrdcp4Sa591XZNLH+PFhdty0o5p3VKV1iHW4owDkvPz mPNQ== X-Gm-Message-State: AOAM533PEYNOTHfkiC257pQrKoYmzcQVx2WmsCwOVyBHJthGs95lOybJ 2ks9p9Xv8bRitxTlZG0DD7jHVA== X-Google-Smtp-Source: ABdhPJxu076cJzW6tB5muGPClE9084UQpEb68XbJV1pH77d5TlcH9qR+ghus+bT1v176SEyeawViaw== X-Received: by 2002:a17:906:4f02:: with SMTP id t2mr7888320eju.121.1616660046098; Thu, 25 Mar 2021 01:14:06 -0700 (PDT) Received: from [192.168.1.54] (hst-208-220.medicom.bg. [84.238.208.220]) by smtp.googlemail.com with ESMTPSA id nd36sm2056890ejc.21.2021.03.25.01.14.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Mar 2021 01:14:05 -0700 (PDT) Subject: Re: linux-next: manual merge of the opp tree with the v4l-dvb tree To: Viresh Kumar Cc: Stephen Rothwell , Mauro Carvalho Chehab , Bryan O'Donoghue , Dmitry Osipenko , Linux Kernel Mailing List , Linux Next Mailing List , Mauro Carvalho Chehab , Yangtao Li References: <20210323112705.3094525d@canb.auug.org.au> <20225c7e-1151-7865-2bc6-a1e5694c3d65@linaro.org> <20210325042530.5clexogqy77v75sm@vireshk-i7> From: Stanimir Varbanov Message-ID: <49a8bca3-d18b-9977-23c2-1dba6e61ef85@linaro.org> Date: Thu, 25 Mar 2021 10:14:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210325042530.5clexogqy77v75sm@vireshk-i7> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Viresh, On 3/25/21 6:25 AM, Viresh Kumar wrote: > On 24-03-21, 16:49, Stanimir Varbanov wrote: >> Thanks Stephen! >> >> On 3/23/21 2:27 AM, Stephen Rothwell wrote: >>> Hi all, >>> >>> Today's linux-next merge of the opp tree got a conflict in: >>> >>> drivers/media/platform/qcom/venus/pm_helpers.c >>> >>> between commit: >>> >>> 08b1cf474b7f ("media: venus: core, venc, vdec: Fix probe dependency error") >>> >>> from the v4l-dvb tree and commit: >>> >>> 857219ae4043 ("media: venus: Convert to use resource-managed OPP API") >>> >>> from the opp 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. >>> >> >> I don't know what is the best solution here. >> >> Viresh, Can I take the OPP API changes through media-tree to avoid >> conflicts? > > I already suggested something similar earlier, and I was expecting > Thierry to respond to that.. Not sure who should pick those patches. > > https://lore.kernel.org/lkml/20210318103250.shjyd66pxw2g2nsd@vireshk-i7/ I guess you meant this thread. https://lore.kernel.org/lkml/20210314163408.22292-1-digetx@gmail.com/ > > Can you please respond to this series then ? > Done. -- regards, Stan