* linux-next: manual merge of the spi tree with the asm-generic tree
@ 2018-03-15 5:11 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2018-03-15 5:11 UTC (permalink / raw)
To: Mark Brown, Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Ulf Magnusson
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in:
drivers/spi/Kconfig
between commit:
588020dcb92a ("treewide: simplify Kconfig dependencies for removed archs")
from the asm-generic tree and commit:
e3d001a0c29d ("spi: kconfig: Remove AVR32 dep. from SPI_ATMEL")
from the spi 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-03-15 5:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-15 5:11 linux-next: manual merge of the spi tree with the asm-generic 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.