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, 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 AFFE3C433F4 for ; Thu, 25 Mar 2021 09:11:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F84F61A25 for ; Thu, 25 Mar 2021 09:11:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230054AbhCYJLE (ORCPT ); Thu, 25 Mar 2021 05:11:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229949AbhCYJKX (ORCPT ); Thu, 25 Mar 2021 05:10:23 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4758DC06175F for ; Thu, 25 Mar 2021 02:10:23 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id r17so1189344pgi.0 for ; Thu, 25 Mar 2021 02:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=TYj9k0I7RZEz57gwWvDtRISrOqiColW76Vz6PZDGR6s=; b=TqYqOhOD0CvZC4dj/wLI3VHgqJuEer0t8ullOBdtdiMBPAjfgrEoB9rQDHzus8Wl/S ooEFjb0JZWvX6wSGCMlaow0RaBJzepLMEXarC/snZFEHLnaNwDrQmKvCDDjcEaQP3yK7 szBWGlDNZSyIOKcI8FeFnvlAQExN0a61aCv70YFT1B5i+x9smSMx6o18FwpKD+fhV5pB HF5j3IpeURPIfHzp7TD1ojoJuyCj61HWA2KoowO4dHKLqDntQRsnPXmJdD7+ZN/IuqFF YF0jeojxf3IuTl5qVh8wjKzywSP+fyWxhzr9VCJXpbuyXQIPo7Y7jttWZsDyxQ1xnp0p HxiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=TYj9k0I7RZEz57gwWvDtRISrOqiColW76Vz6PZDGR6s=; b=P7faBJFOesK1ROz4/+syFJMnnVhc/4+YThNEXG3aPUtfeEPQXo9kWcWU5nnIqjq6EM tPEEo3YdzYYdIl250LF1NTgMPJ6dC//OY7v4Wp316+YYENKLjDEbDRQXj9he+af7rboL C7N7I9mlT4YvTqYg6paWI9yuHWIR2A0iju8tTlxCdyBEqNXUr2QagisITKT6OqVVfzVf prKXctiRnIfyF1NVLIfidUEVca7QII27RYynpnVidy+/E2p0vx9WBMiUActAlNWShyZw K4DpiE4KzgX3WBMwb2S46LLN5dx50CRYjctVWOOExNJI3Vw3Od86vsNkM2QJLl+MlkPK 8UOg== X-Gm-Message-State: AOAM531w1Nc1FaI41SP8ukrCfSMA0+5QfLgx1YNeLstj21l1aqSQypVu EW497Fm/a+C15F1dJlmD54q9Tg== X-Google-Smtp-Source: ABdhPJz7TLT7iPZVbNsDge2Vn4xwLRmNGeBrurRVRwgs3nBM1CYnETndoftqZcYMPjvn7d82H8YIJw== X-Received: by 2002:a63:6a84:: with SMTP id f126mr6552366pgc.352.1616663422831; Thu, 25 Mar 2021 02:10:22 -0700 (PDT) Received: from localhost ([122.172.6.13]) by smtp.gmail.com with ESMTPSA id w17sm4854759pgg.41.2021.03.25.02.10.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Mar 2021 02:10:18 -0700 (PDT) Date: Thu, 25 Mar 2021 14:40:16 +0530 From: Viresh Kumar To: Stanimir Varbanov Cc: Stephen Rothwell , Mauro Carvalho Chehab , Bryan O'Donoghue , Dmitry Osipenko , Linux Kernel Mailing List , Linux Next Mailing List , Mauro Carvalho Chehab , Yangtao Li Subject: Re: linux-next: manual merge of the opp tree with the v4l-dvb tree Message-ID: <20210325091016.hcbbysmvtren32e6@vireshk-i7> References: <20210323112705.3094525d@canb.auug.org.au> <20225c7e-1151-7865-2bc6-a1e5694c3d65@linaro.org> <20210325042530.5clexogqy77v75sm@vireshk-i7> <49a8bca3-d18b-9977-23c2-1dba6e61ef85@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <49a8bca3-d18b-9977-23c2-1dba6e61ef85@linaro.org> User-Agent: NeoMutt/20180716-391-311a52 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 25-03-21, 10:14, Stanimir Varbanov wrote: > I guess you meant this thread. > > https://lore.kernel.org/lkml/20210314163408.22292-1-digetx@gmail.com/ I actually thought some other stuff is having the merge issues (as I was expecting something to happen there) :) Anyway, you did the right thing. Thanks. -- viresh