From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rob Herring <robherring2@gmail.com>,
Boris Brezillon <boris.brezillon@collabora.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the nand tree
Date: Thu, 28 May 2020 09:15:28 +0200 [thread overview]
Message-ID: <20200528091528.0ef4bbbc@xps13> (raw)
In-Reply-To: <20200528145205.13cb8288@canb.auug.org.au>
Hi Stephen,
Stephen Rothwell <sfr@canb.auug.org.au> wrote on Thu, 28 May 2020
14:52:05 +1000:
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> Documentation/devicetree/bindings/mtd/nand-controller.yaml
>
> between commit:
>
> 1777341d9335 ("dt-bindings: mtd: Deprecate OOB_FIRST mode")
>
> from the nand tree and commit:
>
> 3d21a4609335 ("dt-bindings: Remove cases of 'allOf' containing a '$ref'")
>
> from the devicetree tree.
>
> I fixed it up (see below) 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.
>
My change can wait, it's part of a preparation series for a bigger
rework that will come with 5.9 so I'll drop the patch for this release.
I already carry a much bigger release than usual, I don't want to
bother with merge conflicts. Thanks for the fix though!
Cheers,
Miquèl
prev parent reply other threads:[~2020-05-28 7:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 4:52 linux-next: manual merge of the devicetree tree with the nand tree Stephen Rothwell
2020-05-28 7:15 ` Miquel Raynal [this message]
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=20200528091528.0ef4bbbc@xps13 \
--to=miquel.raynal@bootlin.com \
--cc=boris.brezillon@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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).