* linux-next: manual merge of the asm-generic tree with the samsung-krzk-fixes tree
@ 2022-04-04 23:21 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2022-04-04 23:21 UTC (permalink / raw)
To: Arnd Bergmann, Krzysztof Kozlowski
Cc: Christoph Hellwig, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
Hi all,
Today's linux-next merge of the asm-generic tree got a conflict in:
Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml
between commit:
8a1e6bb3f78f ("dt-bindings: update Krzysztof Kozlowski's email")
from the samsung-krzk-fixes tree and commit:
1c4b5ecb7ea1 ("remove the h8300 architecture")
from the asm-generic tree.
I fixed it up (I just removed 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-04 23:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-04 23:21 linux-next: manual merge of the asm-generic tree with the samsung-krzk-fixes tree Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.