From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung•com>,
Arnd Bergmann <arnd@arndb•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Ulf Magnusson <ulfalizer@gmail•com>,
David Howells <dhowells@redhat•com>
Subject: linux-next: manual merge of the fbdev tree with the asm-generic tree
Date: Thu, 15 Mar 2018 12:38:09 +1100 [thread overview]
Message-ID: <20180315123809.5b21870f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
Hi Bartlomiej,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/console/Kconfig
between commits:
739d875dd698 ("mn10300: Remove the architecture")
588020dcb92a ("treewide: simplify Kconfig dependencies for removed archs")
from the asm-generic tree and commit:
f06a51a08f9d ("video: console: kconfig: Remove AVR32 dep. from VGA_CONSOLE")
from the fbdev tree.
I fixed it up (the latter is a subset of the former) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-03-15 1:38 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=20180315123809.5b21870f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=b.zolnierkie@samsung$(echo .)com \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ulfalizer@gmail$(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