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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC543C433F5 for ; Mon, 23 May 2022 14:33:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235737AbiEWOdy (ORCPT ); Mon, 23 May 2022 10:33:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237239AbiEWOdu (ORCPT ); Mon, 23 May 2022 10:33:50 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 599FA59B91 for ; Mon, 23 May 2022 07:33:48 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id c19so12834884lfv.5 for ; Mon, 23 May 2022 07:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=uUMcN1Naz+8bPbUO3zkbfyCIqXOlQxgTqAtcvdgC5g0=; b=GLf/114ZqdjOpVRYY/G+WRuiDTzpUgz3BG5RZ8Fn9QfWICFRI9o4EmCKjpnuKOp1f2 DARMi45DW6HTwEG0HiFlQNu/OT3Fhrs4U7MEZ/P/tJwN+INV9qMuhKj03feQoV99v+sn se5khYtPeYER3HQVPRul8yeBtKIW58fxQse8zrJE5r2DhxCF0ZqPrR8eDNwCLpT5BR35 XgvOeyhY/e5wzAxXCzLuQfVar3IvKMbJeJFX4pP4Yj1D0GO9ur5k5P+Ovt0lNQ71yLpL zLBgIlHtwk7XyK6fqmxA3vm+wangurZtocguMiioDj54eAdiR7dzSboW+SIf2V/5gPly kXMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=uUMcN1Naz+8bPbUO3zkbfyCIqXOlQxgTqAtcvdgC5g0=; b=oqL/N9POvy/ep8w2cmhDGs/2rExNzARyDXkj0JtK1/M12zUWXtzH9tuxaxXoCituNd UZV8HwlhqcnZ8K4sP62oI6szBPlkhg75wQ1OWw79eCecA3qYsbpVUL3sst/wwm3rcxRS lhjuYABcqdCfNI/OjPRbCivaMrsVMMXTolyErXktzl9oFxi3MwkkMv0idSraLZf1/JJ6 8GjahtLf4z2CIXCThGGPwSYjZ9bhLljazqJNNPOw1OH3qZXD88lKCoh9BfmF3mhxJYee xeYcUHFCo3eU6hhSSiK7+ykcXfUn8p88GOV5hQSYnWCLIfzUvVxsMjp04/62sS/cylDh y4OQ== X-Gm-Message-State: AOAM5339KFGI2p59mHRDvEk85g4OQmoM/jcU03In5Oy4P9J0T9ZRJkMO tEAfEFAt6uatdo6c0hxWfEmwxQnicEeH+lat X-Google-Smtp-Source: ABdhPJyp+IMxGBLJlhaj+1AEgvLPT68Y7g/Y7re6YfIt9wPVrgW10diIx+A5l0ZeGr5OftK9CXj57A== X-Received: by 2002:a05:6512:b96:b0:478:5d7b:2e21 with SMTP id b22-20020a0565120b9600b004785d7b2e21mr8631733lfv.305.1653316426651; Mon, 23 May 2022 07:33:46 -0700 (PDT) Received: from [192.168.0.17] (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id u26-20020ac248ba000000b0047255d21188sm2003834lfg.183.2022.05.23.07.33.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 23 May 2022 07:33:46 -0700 (PDT) Message-ID: <4d5c0dee-b32a-158c-e243-de2c4af7e103@linaro.org> Date: Mon, 23 May 2022 16:33:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree tree Content-Language: en-US To: Jassi Brar , Rob Herring Cc: David Heidelberg , Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring , Stephen Rothwell References: <20220523140525.4ad591d0@canb.auug.org.au> From: Krzysztof Kozlowski In-Reply-To: <20220523140525.4ad591d0@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23/05/2022 06:05, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mailbox tree got a conflict in: > > Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml > > between commit: > > b20eee62ee89 ("dt-bindings: mailbox: qcom-ipcc: add missing properties into example") This commit should be rather dropped, because it duplicated my work which entirely removed the example. Rob, Can you drop that commit from your tree? Best regards, Krzysztof