From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Borntraeger <borntraeger@de•ibm.com>,
Cornelia Huck <cohuck@redhat•com>,
Greentime Hu <green.hu@gmail•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Farhan Ali <alifm@linux•vnet.ibm.com>
Subject: linux-next: manual merge of the kvms390 tree with the nds32 tree
Date: Mon, 26 Feb 2018 13:34:45 +1100 [thread overview]
Message-ID: <20180226133445.6544ad34@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2018-02-26 2:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-26 2:34 Stephen Rothwell [this message]
2018-03-19 3:49 ` linux-next: manual merge of the kvms390 tree with the nds32 tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180226133445.6544ad34@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alifm@linux$(echo .)vnet.ibm.com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=cohuck@redhat$(echo .)com \
--cc=green.hu@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox