From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>, Lee Jones <lee.jones@linaro.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the mfd tree
Date: Tue, 6 Oct 2020 17:03:08 +1100 [thread overview]
Message-ID: <20201006170308.68e4781e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 919 bytes --]
Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/arm/samsung/sysreg.yaml
between commit:
18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings")
from the mfd tree and commit:
41fb845621ea ("dt-bindings: Another round of adding missing 'additionalProperties'")
from the devicetree tree.
I fixed it up (I just deleted the 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 --]
next reply other threads:[~2020-10-06 6:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 6:03 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-18 6:04 linux-next: manual merge of the devicetree tree with the mfd tree Stephen Rothwell
2022-03-22 3:10 Stephen Rothwell
2022-03-22 7:18 ` Lee Jones
2022-03-22 12:43 ` Rob Herring
2020-10-01 6:22 Stephen Rothwell
2020-10-01 6:25 ` Krzysztof Kozlowski
2020-10-01 12:31 ` Rob Herring
2020-10-10 10:01 ` Leizhen (ThunderTown)
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=20201006170308.68e4781e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=krzk@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@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