Messages in this thread | | | Date | Fri, 18 Nov 2011 08:18:55 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the tty tree with the tty.current tree |
| |
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
| |