From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Krzysztof Kozlowski <krzk@kernel.org>, Joel Stanley <joel@jms.id.au>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Yang Chen <yangchen.openbmc@gmail.com>
Subject: linux-next: manual merge of the dt-krzk tree with the aspeed tree
Date: Thu, 4 Apr 2024 11:28:07 +1100 [thread overview]
Message-ID: <20240404112807.3c7fc933@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 885 bytes --]
Hi all,
Today's linux-next merge of the dt-krzk tree got a conflict in:
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts
between commits:
4afd304e4e36 ("ARM: dts: aspeed: minerva: Revise the name of DTS")
6241b65454c7 ("ARM: dts: aspeed: minerva: Modify mac3 setting")
from the aspeed tree and commit:
e515719c17be ("ARM: dts: aspeed: minerva-cmc: correct Mellanox multi-host property")
from the dt-krzk tree.
I fixed it up (I just used the former version) 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:[~2024-04-04 0:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240404112807.3c7fc933@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=joel@jms.id.au \
--cc=krzk@kernel.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yangchen.openbmc@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
all inboxes | Powered by JetHome®