linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the tty tree with the genesis tree
@ 2010-07-09  3:49 Stephen Rothwell
  2010-07-09  5:04 ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-07-09  3:49 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Guennadi Liakhovetski, Paul Mundt,
	Alan Cox

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
include/linux/serial_core.h between commit
75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type,
found on some sh-mobile SoCs") from the genesis tree and commit
4286e9ca73813ee0ab5b0bd63b7eaefeb4994334 ("serial: max3107: Abstract out
the platform specific bits") from the tty tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/serial_core.h
index 5228320,9ddc866..0000000
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@@ -186,9 -186,10 +186,13 @@@
  #define PORT_ALTERA_JTAGUART	91
  #define PORT_ALTERA_UART	92
  
 +/* SH-SCI */
 +#define PORT_SCIFB	93
 +
+ /* MAX3107 */
+ #define PORT_MAX3107	94
+ 
+ 
  #ifdef __KERNEL__
  
  #include <linux/compiler.h>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the tty tree with the genesis tree
  2010-07-09  3:49 linux-next: manual merge of the tty tree with the genesis tree Stephen Rothwell
@ 2010-07-09  5:04 ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2010-07-09  5:04 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Guennadi Liakhovetski, Paul Mundt,
	Alan Cox

On Fri, Jul 09, 2010 at 01:49:39PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> include/linux/serial_core.h between commit
> 75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type,
> found on some sh-mobile SoCs") from the genesis tree and commit
> 4286e9ca73813ee0ab5b0bd63b7eaefeb4994334 ("serial: max3107: Abstract out
> the platform specific bits") from the tty tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Thanks, as long as the numbers are sequencial, and they are, it should
be fine.  Alan was good in making the patch up correctly :)

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread
* linux-next: manual merge of the tty tree with the genesis tree
@ 2010-07-27  4:34 Stephen Rothwell
  2010-07-27  4:47 ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-07-27  4:34 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Feng Tang, Guennadi Liakhovetski,
	Paul Mundt

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
include/linux/serial_core.h between commit
75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type,
found on some sh-mobile SoCs") from the genesis tree and commit
c3190cf68dfc58c33de0fd59b919cbb864acbba4 ("hsu: driver for Medfield High
Speed UART device") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/serial_core.h
index 5228320,f8fce35..0000000
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@@ -186,9 -186,12 +186,15 @@@
  #define PORT_ALTERA_JTAGUART	91
  #define PORT_ALTERA_UART	92
  
 +/* SH-SCI */
 +#define PORT_SCIFB	93
 +
+ /* MAX3107 */
+ #define PORT_MAX3107	94
+ 
+ /* High Speed UART for Medfield */
+ #define PORT_MFD	95
+ 
  #ifdef __KERNEL__
  
  #include <linux/compiler.h>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the tty tree with the genesis tree
  2010-07-27  4:34 Stephen Rothwell
@ 2010-07-27  4:47 ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2010-07-27  4:47 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Feng Tang, Guennadi Liakhovetski,
	Paul Mundt

On Tue, Jul 27, 2010 at 02:34:30PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> include/linux/serial_core.h between commit
> 75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type,
> found on some sh-mobile SoCs") from the genesis tree and commit
> c3190cf68dfc58c33de0fd59b919cbb864acbba4 ("hsu: driver for Medfield High
> Speed UART device") from the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, the fix looks fine.

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-27  4:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-09  3:49 linux-next: manual merge of the tty tree with the genesis tree Stephen Rothwell
2010-07-09  5:04 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2010-07-27  4:34 Stephen Rothwell
2010-07-27  4:47 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).