linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: Jassi Brar <jaswinder.singh@linaro.org>,
	Rob Herring <robherring2@gmail.com>
Cc: David Heidelberg <david@ixit.cz>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Rob Herring <robh@kernel.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree tree
Date: Mon, 23 May 2022 16:33:45 +0200	[thread overview]
Message-ID: <4d5c0dee-b32a-158c-e243-de2c4af7e103@linaro.org> (raw)
In-Reply-To: <20220523140525.4ad591d0@canb.auug.org.au>

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

  reply	other threads:[~2022-05-23 14:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-23  4:05 linux-next: manual merge of the mailbox tree with the devicetree tree Stephen Rothwell
2022-05-23 14:33 ` Krzysztof Kozlowski [this message]
2022-05-23 14:39   ` Rob Herring
  -- strict thread matches above, loose matches on Subject: below --
2019-11-28  0:41 Stephen Rothwell
2019-11-28  9:25 ` Arnaud POULIQUEN

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4d5c0dee-b32a-158c-e243-de2c4af7e103@linaro.org \
    --to=krzysztof.kozlowski@linaro.org \
    --cc=david@ixit.cz \
    --cc=jaswinder.singh@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=robh@kernel.org \
    --cc=robherring2@gmail.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).