On Fri, Feb 23, 2018 at 3:09 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > 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 Which brings us to repeating the old advice: "The next new architecture added should invest the work to add a MAY_HAVE_VGA_CONSOLE Kconfig symbol, to be selected by the handful architectures/platforms that can have a VGA console". Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html