Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: drivers/video/console/Kconfig between commit: 2312dbf7462b ("drivers/video/concole: add negative dependency for VGA_CONSOLE on nds32") from the nds32 tree and commit: 2f1ca75f69f3 ("s390/setup : enable display support for KVM guest") from the kvms390 tree. I fixed it up (see below) 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 diff --cc drivers/video/console/Kconfig index 27bb893cf6b2,7aa721e3a581..000000000000 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@@ -9,7 -9,7 +9,7 @@@ config VGA_CONSOL depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \ !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ - !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 - !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !S390 ++ !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390 default y help Saying Y here will allow you to use Linux in text mode through a
Attachment:
pgp45iQtKdJMY.pgp
Description: OpenPGP digital signature