* linux-next: manual merge of the spi tree with the mips tree
@ 2019-01-24 2:27 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-01-24 2:27 UTC (permalink / raw)
To: Mark Brown, Ralf Baechle, James Hogan
Cc: Linux Next Mailing List, Linux Kernel Mailing List, John Crispin,
Paul Burton, Alban Bedel
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in:
arch/mips/ath79/dev-spi.h
between commit:
85b9686dae30 ("MIPS: ath79: drop platform device registration code")
from the mips tree and commit:
b172fd0c8980 ("spi: ath79: Enable support for compile test")
from the spi tree.
I fixed it up (the former removed the file so I did that) 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:[~2019-01-24 2:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-24 2:27 linux-next: manual merge of the spi tree with the mips tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox