From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752071Ab1AGXmD (ORCPT ); Fri, 7 Jan 2011 18:42:03 -0500 Received: from cantor.suse.de ([195.135.220.2]:40211 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751635Ab1AGXmB (ORCPT ); Fri, 7 Jan 2011 18:42:01 -0500 Date: Fri, 7 Jan 2011 15:41:49 -0800 From: Greg KH To: Linus Torvalds Cc: Daniel Hellstrom , "David S. Miller" , Thomas Gleixner , Ingo Molnar , Andrew Morton , linux-kernel@vger.kernel.org, Alan Cox , Kay Sievers Subject: Re: [GIT PATCH] TTY/serial merge for .38 Message-ID: <20110107234149.GA18421@suse.de> References: <20110106215404.GA30624@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? thanks, greg k-h