From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiri Slaby <jslaby@suse.cz>, Dave Young <dyoung@redhat.com>
Subject: Re: linux-next: manual merge of the tty tree with the tty.current tree
Date: Fri, 18 Nov 2011 08:18:55 -0800 [thread overview]
Message-ID: <20111118161855.GA30462@kroah.com> (raw)
In-Reply-To: <20111118143010.4a6c9eb17b86d24b9ebe706b@canb.auug.org.au>
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
next prev parent reply other threads:[~2011-11-18 16:35 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-18 3:30 linux-next: manual merge of the tty tree with the tty.current tree Stephen Rothwell
2011-11-18 8:41 ` Jiri Slaby
2011-11-18 16:18 ` Greg KH [this message]
2011-11-27 4:08 ` Greg KH
2012-04-19 4:59 Stephen Rothwell
2012-04-19 20:07 ` Greg KH
2012-04-23 16:40 ` Greg KH
2013-01-17 2:07 Stephen Rothwell
2013-01-18 1:27 ` Greg KH
2014-11-10 4:49 Stephen Rothwell
2014-11-10 5:08 ` Greg KH
2014-11-26 7:12 Stephen Rothwell
2014-11-26 19:51 ` Greg KH
2015-05-25 8:19 Stephen Rothwell
2015-05-25 16:28 ` Greg KH
2015-05-26 11:08 ` Dave Martin
2016-02-08 2:16 Stephen Rothwell
2016-02-08 2:21 ` Greg KH
2016-02-08 2:53 ` Peter Hurley
2016-04-01 0:23 ` Peter Hurley
2016-04-01 3:49 ` Greg KH
2017-03-20 2:28 Stephen Rothwell
2017-03-20 9:21 ` Dmitry Vyukov
2017-03-20 9:26 ` Dmitry Vyukov
2017-03-29 5:51 ` Greg KH
2017-03-30 3:46 ` Michael Neuling
2017-03-30 12:17 ` Dmitry Vyukov
2017-08-02 4:26 Stephen Rothwell
2017-08-04 1:02 ` Greg KH
2017-08-14 22:17 ` Greg KH
2019-12-18 0:49 Stephen Rothwell
2019-12-18 7:05 ` Greg KH
2020-09-17 6:09 Stephen Rothwell
2020-09-17 6:34 ` Greg KH
2023-10-04 1:55 Stephen Rothwell
2023-10-04 2:14 ` Stephen Rothwell
2023-10-04 6:38 ` Greg KH
2023-10-16 8:20 ` Greg KH
2024-04-11 3:57 Stephen Rothwell
2024-04-11 4:17 ` Stephen Rothwell
2024-04-11 4:38 ` Greg KH
2024-04-11 10:40 ` Andy Shevchenko
2024-04-19 4:19 Stephen Rothwell
2024-04-19 6:09 ` Greg KH
2024-04-23 11:24 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111118161855.GA30462@kroah.com \
--to=greg@kroah.com \
--cc=dyoung@redhat.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.