From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Simon Horman <horms@verge•net.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jingchang Lu <b35083@freescale•com>,
Ulrich Hecht <ulrich.hecht@gmail•com>
Subject: Re: linux-next: manual merge of the renesas tree with the tty tree
Date: Mon, 17 Jun 2013 12:35:05 -0700 [thread overview]
Message-ID: <20130617193505.GA20255@kroah.com> (raw)
In-Reply-To: <20130617171622.450bae1a5319f54004a18e2d@canb.auug.org.au>
On Mon, Jun 17, 2013 at 05:16:22PM +1000, Stephen Rothwell wrote:
> Hi Simon,
>
> Today's linux-next merge of the renesas tree got a conflict in
> include/uapi/linux/serial_core.h between commit c9e2e946fb0b ("tty:
> serial: add Freescale lpuart driver support") from the tty tree and
> commit 24610a30600b ("serial: sh-sci: HSCIF support") from the renesas
> 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 include/uapi/linux/serial_core.h
> index c8eaeb5,26eee07..0000000
> --- a/include/uapi/linux/serial_core.h
> +++ b/include/uapi/linux/serial_core.h
> @@@ -226,7 -226,7 +226,10 @@@
> /* Rocketport EXPRESS/INFINITY */
> #define PORT_RP2 102
>
> +/* Freescale lpuart */
> +#define PORT_LPUART 103
> +
> + /* SH-SCI */
> -#define PORT_HSCIF 103
> ++#define PORT_HSCIF 104
Looks correct to me, thanks.
greg k-h
prev parent reply other threads:[~2013-06-17 19:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 7:16 linux-next: manual merge of the renesas tree with the tty tree Stephen Rothwell
2013-06-17 19:35 ` Greg KH [this message]
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=20130617193505.GA20255@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=b35083@freescale$(echo .)com \
--cc=horms@verge$(echo .)net.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=ulrich.hecht@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