From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Tomi Valkeinen <tomi.valkeinen@ti•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Nicolai Stange <nicstange@gmail•com>,
Yuriy Kolerov <yuriy.kolerov@synopsys•com>
Subject: linux-next: manual merge of the akpm-current tree with the omap_dss2 tree
Date: Mon, 24 Aug 2015 20:53:32 +1000 [thread overview]
Message-ID: <20150824205332.3ecb165a@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/video/console/Kconfig
between commit:
48fd8ecf29e3 ("framebuffer: disable vgacon on microblaze arch")
from the omap_dss2 tree and commit:
4b9939fb41ee ("drivers/video/concole: add negative dependency for VGA_CONSOLE on ARC")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
Another place begging for a controlling CONFIG_ symbol that other
places can select (or a negative symbol).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/video/console/Kconfig
index e0dc0fee4ea6,071280643db7..000000000000
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@@ -9,7 -9,7 +9,7 @@@ config VGA_CONSOL
depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \
!SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \
(!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
- !ARM64 && !MICROBLAZE
- !ARM64 && !ARC
++ !ARM64 && !MICROBLAZE && !ARC
default y
help
Saying Y here will allow you to use Linux in text mode through a
reply other threads:[~2015-08-24 10:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150824205332.3ecb165a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicstange@gmail$(echo .)com \
--cc=tomi.valkeinen@ti$(echo .)com \
--cc=yuriy.kolerov@synopsys$(echo .)com \
/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