Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp1983105ioo; Mon, 23 May 2022 07:34:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjlquomzNR9XRapX9ayZMvYzeKBIa1OJHCwG7hyNWvUvQ1rTDNLO+YC/kjkN0W8MT0aAtB X-Received: by 2002:a17:902:e846:b0:162:27bf:eda with SMTP id t6-20020a170902e84600b0016227bf0edamr4604913plg.119.1653316460465; Mon, 23 May 2022 07:34:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316460; cv=none; d=google.com; s=arc-20160816; b=U8TpA8HP1Z00F4j6DfUh9FM/WvOZR2juLNSrEdxd2Ow282+2Np3DbOdsePTuo1QV79 J9Ia/wp+7qRMDzr25PMiEUCvP3uWYy69iLXFD2C0StDn2guL8+PENoYbr+hsdXawDzZQ ktXqaZuqtvlKphwOQ2yol8kLWul9MuMrUfSnDNDEVWMWrE8zBao29RPdzemtuaHsIyK8 5DmzBA/Da0H97MzMDFriGid3YXlkQ4+fEJ8llHOotLd0UUyJ/SS8ImroYhLJJkO2cd9p PKUq1KCkWmQn5QCeVF8IbGFZuIBp4tNyWq2JLaFmAeV12O/q4cnnGXZzK/iA3eYRjYXX 6gHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=uUMcN1Naz+8bPbUO3zkbfyCIqXOlQxgTqAtcvdgC5g0=; b=FS3IJwceWq4NXU1WOndro6aDt8o+3i7PEkXmRnccXeq7DnUzCQNyI5APz/7cmBtmlJ uqnJpIO0X8q0aX8gI762FKMtH8Vez2tFx/vS0VDw8DIwZJ6rgD8jxJx5ZeMevyCjrINf bm9kf+Jz4G1Ag0oBPEQqQiDkauXUiG++b4TQx1Vl06X/m/A9A2U1xOilt4l50MKUvG2v 8hezmvn7WoFJS6S4J5PrpKNk1Z8Mz3zft/KAU8+SuTcvEIJM/hHNMNtjQh37crbbh6g+ KZiR4KqbQA2oOw3PFSGa1JPE9kqfL0Dpg14GIH/xpZagFVzoRUQCCXA20d6TWLRcPdne Wqrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="GLf/114Z"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id t10-20020a170902e84a00b00161f4c50ef4si10312490plg.312.2022.05.23.07.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 07:34:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="GLf/114Z"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D67EE2E9E5; Mon, 23 May 2022 07:34:03 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237272AbiEWOdx (ORCPT + 99 others); Mon, 23 May 2022 10:33:53 -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-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 X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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