From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Burton <paul.burton@imgtec.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Subject: Re: linux-next: manual merge of the tty tree with the mips tree
Date: Tue, 9 Jun 2015 14:10:14 -0700 [thread overview]
Message-ID: <20150609211014.GA16485@kroah.com> (raw)
In-Reply-To: <20150609205953.4ecde1ce@canb.auug.org.au>
On Tue, Jun 09, 2015 at 08:59:53PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got conflicts in
> drivers/tty/serial/8250/Kconfig and drivers/tty/serial/8250/Makefile
> between commit d4a7bd1c0e5e ("serial: 8250_ingenic: support for Ingenic
> SoC UARTs") from the mips tree and commit 1a8d2903cb6a ("serial:
> 8250_uniphier: add UniPhier serial driver") from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/tty/serial/8250/Kconfig
> index 43330ea95cfd,a74a8e4717d4..000000000000
> --- a/drivers/tty/serial/8250/Kconfig
> +++ b/drivers/tty/serial/8250/Kconfig
> @@@ -343,11 -351,9 +351,18 @@@ config SERIAL_8250_MT657
> If you have a Mediatek based board and want to use the
> serial port, say Y to this option. If unsure, say N.
>
> +config SERIAL_8250_INGENIC
> + bool "Support for Ingenic SoC serial ports"
> + depends on SERIAL_8250_CONSOLE && OF_FLATTREE
> + select LIBFDT
> + select SERIAL_EARLYCON
> + help
> + If you have a system using an Ingenic SoC and wish to make use of
> + its UARTs, say Y to this option. If unsure, say N.
> ++
> + config SERIAL_8250_UNIPHIER
> + tristate "Support for UniPhier on-chip UART"
> + depends on SERIAL_8250 && ARCH_UNIPHIER
> + help
> + If you have a UniPhier based board and want to use the on-chip
> + serial ports, say Y to this option. If unsure, say N.
> diff --cc drivers/tty/serial/8250/Makefile
> index 98fba26e194a,6fa22ffad63d..000000000000
> --- a/drivers/tty/serial/8250/Makefile
> +++ b/drivers/tty/serial/8250/Makefile
> @@@ -22,7 -22,6 +22,9 @@@ obj-$(CONFIG_SERIAL_8250_DW) += 8250_d
> obj-$(CONFIG_SERIAL_8250_EM) += 8250_em.o
> obj-$(CONFIG_SERIAL_8250_OMAP) += 8250_omap.o
> obj-$(CONFIG_SERIAL_8250_FINTEK) += 8250_fintek.o
> + obj-$(CONFIG_SERIAL_8250_LPC18XX) += 8250_lpc18xx.o
> obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o
> +obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o
> +
> +CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt
> + obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o
Fix looks good, thanks for this.
greg k-h
next prev parent reply other threads:[~2015-06-09 21:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-09 10:59 linux-next: manual merge of the tty tree with the mips tree Stephen Rothwell
2015-06-09 21:10 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-05-02 5:52 Stephen Rothwell
2016-05-02 15:28 ` Greg KH
2011-11-18 3:22 Stephen Rothwell
2011-11-18 16:19 ` Greg KH
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=20150609211014.GA16485@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.burton@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.