linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jassi Brar <jaswinder.singh@linaro.org>,
	Rob Herring <robherring2@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Arnaud Pouliquen <arnaud.pouliquen@st.com>,
	Fabien Dessenne <fabien.dessenne@st.com>
Subject: linux-next: manual merge of the mailbox tree with the devicetree tree
Date: Thu, 28 Nov 2019 11:41:27 +1100	[thread overview]
Message-ID: <20191128114127.0f1e3b06@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

Hi all,

Today's linux-next merge of the mailbox tree got a conflict in:

  Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt

between commit:

  4360bf724483 ("dt-bindings: mailbox: convert stm32-ipcc to json-schema")

from the devicetree tree and commit:

  9b2cfd3fb09e ("dt-bindings: mailbox: stm32-ipcc: Updates for wakeup management")

from the mailbox tree.

I fixed it up (I just deleted the file - presumably there will need to be
followup fixes to the json file) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-11-28  0:41 UTC|newest]

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

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=20191128114127.0f1e3b06@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnaud.pouliquen@st.com \
    --cc=fabien.dessenne@st.com \
    --cc=jaswinder.singh@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=robherring2@gmail.com \
    /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).