From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiri Slaby <jslaby@suse.cz>, Dave Young <dyoung@redhat.com>
Subject: linux-next: manual merge of the tty tree with the tty.current tree
Date: Fri, 18 Nov 2011 14:30:10 +1100 [thread overview]
Message-ID: <20111118143010.4a6c9eb17b86d24b9ebe706b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1838 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/tty/tty_ldisc.c
index 8e0924f,174db3b..0000000
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@@ -24,19 -16,8 +16,9 @@@
#include <linux/device.h>
#include <linux/wait.h>
#include <linux/bitops.h>
- #include <linux/delay.h>
#include <linux/seq_file.h>
-
#include <linux/uaccess.h>
- #include <asm/system.h>
-
- #include <linux/kbd_kern.h>
- #include <linux/vt_kern.h>
- #include <linux/selection.h>
-
- #include <linux/kmod.h>
- #include <linux/nsproxy.h>
+#include <linux/ratelimit.h>
/*
* This guards the refcounted line discipline lists. The lock
@@@ -553,13 -533,11 +535,11 @@@ static void tty_ldisc_flush_works(struc
* Wait for the line discipline to become idle. The discipline must
* have been halted for this to guarantee it remains idle.
*/
-static int tty_ldisc_wait_idle(struct tty_struct *tty)
+static int tty_ldisc_wait_idle(struct tty_struct *tty, long timeout)
{
- int ret;
+ long ret;
ret = wait_event_timeout(tty_ldisc_idle,
- atomic_read(&tty->ldisc->users) == 1, 5 * HZ);
+ atomic_read(&tty->ldisc->users) == 1, timeout);
- if (ret < 0)
- return ret;
return ret > 0 ? 0 : -EBUSY;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-11-18 3:30 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-18 3:30 Stephen Rothwell [this message]
2011-11-18 8:41 ` linux-next: manual merge of the tty tree with the tty.current tree Jiri Slaby
2011-11-18 16:18 ` Greg KH
2011-11-27 4:08 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
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=20111118143010.4a6c9eb17b86d24b9ebe706b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dyoung@redhat.com \
--cc=greg@kroah.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).