Re: [GIT PATCH] TTY/serial merge for .38

[Daniel Hellstrom]

Greg KH wrote:

> On Fri, Jan 07, 2011 at 02:44:14PM -0800, Linus Torvalds wrote:
>  
>
> > On Thu, Jan 6, 2011 at 1:54 PM, Greg KH <gregkh@xxxxxxx> wrote:
> >    
> >
> > > Here is the big tty and serial merge for .38.  I'll be sending another
> > > smaller one that just moves drivers around after .38-rc1 is out, as is
> > > the norm for file moves to handle issues with other trees syncing up
> > > properly.
> > >      
> > Merged. However, the drivers/serial/apbuart.c file conflicted, and
> > both sides of the merge had some insanity in them.
> >
> > So I did an "evil merge" - a merge that actually changed the code to
> > match neither side - and it looks better to me. But maybe that's just
> > the drugs I'm taking talking.
> >
> > So people should check it out. In particular, look at the interaction
> > of "drivers: serial: apbuart: Handle OF failures gracefully" and the
> > "Added support for ampopts in APBUART driver. Used in AMP systems"
> > commit.
> >    
>
> The merge looks ok to me, but I don't have this hardware, so I can't
> test it.  Thomas, can you verify this is ok?
>  

The code looks good and I have tested on the APBUART hardware - it works.

Thanks,
Daniel Hellstrom

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/