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,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
Mark Adamson <mark.adamson@ftdichip.com>
Subject: linux-next: manual merge of the usb tree with the ttydev tree
Date: Wed, 3 Jun 2009 18:13:45 +1000 [thread overview]
Message-ID: <20090603181345.0e6ae020.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/ftdi_sio.c between commit
436d74ab8174ba48ad97c3de80c8de6aaff6c931 ("tty-usb-ft232-latency") from
the ttydev tree and commit ac0ceefdc8cdf4bbe6cdaf6d2175e0dfdbfd6700
("USB: ftdi_sio: fix hi-speed device packet size calculation") from the
usb tree.
Overlapping additions. I fixed it up (see below), but have no idea if
there are higher level interactions (or the ordering is right) i.e.
please check this.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/ftdi_sio.c
index 59c7501,ec20993..0000000
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@@ -1417,7 -1500,7 +1524,8 @@@ static int ftdi_sio_port_probe(struct u
usb_set_serial_port_data(port, priv);
ftdi_determine_type(port);
+ read_latency_timer(port);
+ ftdi_set_max_packet_size(port);
create_sysfs_attrs(port);
return 0;
}
next reply other threads:[~2009-06-03 8:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-03 8:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-10 8:41 Stephen Rothwell
2009-06-10 10:06 ` Alan Cox
2009-06-10 11:09 ` Stephen Rothwell
2009-06-05 5:41 Stephen Rothwell
2009-06-05 17:42 ` Greg KH
2009-06-05 5:34 Stephen Rothwell
2009-06-05 17:42 ` Greg KH
2009-06-03 8:07 Stephen Rothwell
2009-06-03 8:55 ` Alan Cox
2009-06-03 10:46 ` Stephen Rothwell
2009-06-03 15:00 ` Greg KH
2009-06-03 7:55 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=20090603181345.0e6ae020.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.adamson@ftdichip.com \
/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
all inboxes | Powered by JetHome®