From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758163Ab1KRQfu (ORCPT ); Fri, 18 Nov 2011 11:35:50 -0500 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:52890 "EHLO out2.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752905Ab1KRQfs (ORCPT ); Fri, 18 Nov 2011 11:35:48 -0500 X-Sasl-enc: Ze8Li9n/2sISvGFWW8X3qaRBLoZfbcMTj5i/xt0OGvCo 1321634147 Date: Fri, 18 Nov 2011 08:18:55 -0800 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby , Dave Young Subject: Re: linux-next: manual merge of the tty tree with the tty.current tree Message-ID: <20111118161855.GA30462@kroah.com> References: <20111118143010.4a6c9eb17b86d24b9ebe706b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111118143010.4a6c9eb17b86d24b9ebe706b@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 18, 2011 at 02:30:10PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/tty/tty_ldisc.c between commits df92d0561de3 ("TTY: ldisc, allow > waiting for ldisc arbitrarily long") and 0c73c08ec73d ("TTY: ldisc, wait > for ldisc infinitely in hangup") from the tty.current tree and commits > 66ef27c3fd0e ("tty_ldisc: remove unnecessary negative return check for > wait_event_timeout") and 8b3ffa173ffa ("TTY: ldisc, remove some unneeded > includes") from the tty tree. > > I fixed it up (see below) and can carry the fix as necessary. Thanks, the fix looks correct, I'll end up resolving it when I merge the tty-linus tree to Linus. greg k-h