From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jason Wessel <jason.wessel@windriver.com>,
Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the ttydev tree with the usb.current tree
Date: Thu, 9 Jul 2009 13:04:30 +1000 [thread overview]
Message-ID: <20090709130430.090863dd.sfr@canb.auug.org.au> (raw)
Hi Alan,
Today's linux-next merge of the ttydev tree got conflicts in
drivers/usb/serial/generic.c and include/linux/usb/serial.h between commit
d8298d029cdd5d944c3d8369d2862de94d12ae4b ("USB: serial: regression fix to
move sysrq from hot path") from the usb.current tree and commit
cf8456fe1aaed1776bf4c26c18adef76e472b9fa ("tty-usb-fix-perf-regression")
from the ttydev tree. Also between commit
a2170a444ef9a89a7ec9acc72d79e5db433effc4 ("USB: serial: optimize sysrq
function calls") from the usb.current tree and commit
bfce6b042a47c9cdd55c7cd231e58710ec1fa4e1 ("tty-usb-fix-kref-leak") from
the ttydev tree.
The first two commits above seem to be trying to do the same thing (or
similar) so I have used the ttydev version for now.
I fixed them up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/generic.c
index 48f6743,21dd6e7..0000000
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
diff --cc include/linux/usb/serial.h
index 4601e0d,0ec50ba..0000000
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@@ -325,34 -330,6 +325,35 @@@ extern struct usb_serial_driver usb_ser
extern struct bus_type usb_serial_bus_type;
extern struct tty_driver *usb_serial_tty_driver;
- static inline int usb_serial_handle_sysrq_char(struct usb_serial_port *port,
++static inline int usb_serial_handle_sysrq_char(struct tty_struct *tty,
++ struct usb_serial_port *port,
+ unsigned int ch)
+{
+#ifdef CONFIG_MAGIC_SYSRQ
+ if (port->sysrq && port->console) {
+ if (ch && time_before(jiffies, port->sysrq)) {
- handle_sysrq(ch, tty_port_tty_get(&port->port));
++ handle_sysrq(ch, tty);
+ port->sysrq = 0;
+ return 1;
+ }
+ port->sysrq = 0;
+ }
+#endif /* CONFIG_MAGIC_SYSRQ */
+ return 0;
+}
+
+static inline int usb_serial_handle_break(struct usb_serial_port *port)
+{
+#ifdef CONFIG_MAGIC_SYSRQ
+ if (!port->sysrq) {
+ port->sysrq = jiffies + HZ*5;
+ return 1;
+ }
+ port->sysrq = 0;
+#endif /* CONFIG_MAGIC_SYSRQ */
+ return 0;
+}
+
static inline void usb_serial_debug_data(int debug,
struct device *dev,
const char *function, int size,
next reply other threads:[~2009-07-09 3:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-09 3:04 Stephen Rothwell [this message]
2009-07-09 23:19 ` linux-next: manual merge of the ttydev tree with the usb.current tree Greg KH
2009-07-10 0:06 ` Stephen Rothwell
2009-07-10 0:13 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2009-07-28 4:01 Stephen Rothwell
2009-07-28 10:26 ` Alan Cox
2009-07-28 12:10 ` Oliver Neukum
2009-07-28 12:29 ` Alan Cox
2009-07-28 12:35 ` Stephen Rothwell
2009-07-28 13:17 ` Alan Cox
2009-07-28 16:32 ` Greg KH
2009-07-28 16:34 ` Greg KH
2009-07-28 19:21 ` Oliver Neukum
2009-07-28 19:24 ` Alan Cox
2009-04-23 4:49 Stephen Rothwell
2009-04-23 4:34 Stephen Rothwell
2009-04-23 4:30 Stephen Rothwell
2009-04-22 3:38 Stephen Rothwell
2009-04-22 15:50 ` Alan Stern
2009-04-22 16:30 ` Alan Cox
2009-04-22 16:38 ` Greg KH
2009-04-28 4:42 ` Stephen Rothwell
2009-04-28 4:58 ` Greg KH
2009-04-28 6:45 ` Stephen Rothwell
2009-03-12 4:04 Stephen Rothwell
2009-03-12 9:44 ` Alan Cox
2009-03-12 11:02 ` Stephen Rothwell
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=20090709130430.090863dd.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=greg@kroah.com \
--cc=jason.wessel@windriver.com \
--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 NNTP newsgroup(s).