* linux-next: manual merge of the kvms390 tree with the nds32 tree
@ 2018-02-26 2:34 Stephen Rothwell
2018-03-19 3:49 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-02-26 2:34 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck, Greentime Hu
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Farhan Ali
[-- Attachment #1: Type: text/plain, Size: 1566 bytes --]
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 commits:
8da93aca3729 ("Kconfig : Remove HAS_IOMEM dependency for Graphics support")
416b744f4494 ("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,b9c2c916247e..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 && HAS_IOMEM && !S390
++ !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && HAS_IOMEM && !S390
default y
help
Saying Y here will allow you to use Linux in text mode through a
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the kvms390 tree with the nds32 tree
2018-02-26 2:34 linux-next: manual merge of the kvms390 tree with the nds32 tree Stephen Rothwell
@ 2018-03-19 3:49 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2018-03-19 3:49 UTC (permalink / raw)
To: Greentime Hu, Paolo Bonzini, Radim Krčmář, KVM
Cc: Christian Borntraeger, Cornelia Huck, Linux-Next Mailing List,
Linux Kernel Mailing List, Farhan Ali
[-- Attachment #1: Type: text/plain, Size: 1831 bytes --]
Hi all,
On Mon, 26 Feb 2018 13:34:45 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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 commits:
>
> 8da93aca3729 ("Kconfig : Remove HAS_IOMEM dependency for Graphics support")
> 416b744f4494 ("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,b9c2c916247e..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 && HAS_IOMEM && !S390
> ++ !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && HAS_IOMEM && !S390
> default y
> help
> Saying Y here will allow you to use Linux in text mode through a
This conflict is now between the kvm tree and the nds32 tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-19 3:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-26 2:34 linux-next: manual merge of the kvms390 tree with the nds32 tree Stephen Rothwell
2018-03-19 3:49 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox