Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755457Ab1BJSvp (ORCPT ); Thu, 10 Feb 2011 13:51:45 -0500 Received: from kroah.org ([198.145.64.141]:36848 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754909Ab1BJSvc (ORCPT ); Thu, 10 Feb 2011 13:51:32 -0500 Date: Thu, 10 Feb 2011 10:51:15 -0800 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Ungerer , Tejun Heo Subject: Re: linux-next: manual merge of the tty tree with the m68knommu tree Message-ID: <20110210185115.GB15944@kroah.com> References: <20110210162914.eec2f4b5.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110210162914.eec2f4b5.sfr@canb.auug.org.au> 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 Content-Length: 799 Lines: 21 On Thu, Feb 10, 2011 at 04:29:14PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/tty/serial/68328serial.c between commit > abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu: fix derefernce of > port.tty") from the m68knommu tree and commit > f094298bae5f5d0e1cb3bff4621aae7ef486812a ("68328serial: remove unsed > m68k_serial->tqueue_hangup") from the tty tree. > > I just used the latter since it removed some of the code modified by the > former. Sounds fine, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/