[lkml]   [2011]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [GIT PATCH] TTY/serial merge for .38
    On Fri, Jan 07, 2011 at 02:44:14PM -0800, Linus Torvalds wrote:
    > On Thu, Jan 6, 2011 at 1:54 PM, Greg KH <> 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?


    greg k-h
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to
    More majordomo info at
    Please read the FAQ at

     \ /
      Last update: 2011-01-08 00:45    [W:0.023 / U:0.624 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site