linux-next: manual merge of the ttydev tree

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/safe_serial.c between commit
8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB: remove info() macro from
usb.h") from the usb tree and commit
5e6c4a742d494b0b049d7f01ce00da5b351d2cb8 ("tty-usbserial-kref") from the
ttydev tree.

These changes modify each others context.  I fixed it up (see below) and
can carry the fix.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/usb/serial/safe_serial.c
index e1f10a1,72903ac..0000000
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@@ -248,11 -250,11 +250,11 @@@ static void safe_read_bulk_callback(str
  		if (!fcs) {
  			int actual_length = data[length - 2] >> 2;
  			if (actual_length <= (length - 2)) {
 -				info("%s - actual: %d", __func__,
 -							actual_length);
 +				dev_info(&urb->dev->dev, "%s - actual: %d\n",
 +					 __func__, actual_length);
- 				tty_insert_flip_string(port->port.tty,
+ 				tty_insert_flip_string(tty,
  							data, actual_length);
- 				tty_flip_buffer_push(port->port.tty);
+ 				tty_flip_buffer_push(tty);
  			} else {
  				err("%s - inconsistent lengths %d:%d",
  					__func__, actual_length, length);

Re: linux-next: manual merge of the ttydev tree

[Greg KH]

On Tue, Aug 19, 2008 at 05:43:10PM +1000, Stephen Rothwell wrote:
> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/serial/safe_serial.c between commit
> 8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB: remove info() macro from
> usb.h") from the usb tree and commit
> 5e6c4a742d494b0b049d7f01ce00da5b351d2cb8 ("tty-usbserial-kref") from the
> ttydev tree.
> 
> These changes modify each others context.  I fixed it up (see below) and
> can carry the fix.

Looks fine to me, thanks for doing this.

greg k-h

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/serial/8250.c between commit
507ce132910803e8fd1116467e99f59da3d526f0 ("iop13xx: workaround errata
that causes uart interrupts to be missed") from the async_tx tree and
commit 63c4074301f79f1620d6c880973d6ef1cc770990
("tty-serial-8250-regops") from the ttydev tree.

I have reverted the async_tx commit for today. Please try to figure out
what should happen here.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Thu, 11 Dec 2008 17:26:45 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/serial/8250.c between commit
> 507ce132910803e8fd1116467e99f59da3d526f0 ("iop13xx: workaround errata
> that causes uart interrupts to be missed") from the async_tx tree and
> commit 63c4074301f79f1620d6c880973d6ef1cc770990
> ("tty-serial-8250-regops") from the ttydev tree.
> 
> I have reverted the async_tx commit for today. Please try to figure out
> what should happen here.

Dan - can you feed the uart 8250 patches through the ttydev tree or are
there dependancies on other parts of async_tx ?

Alan

Re: linux-next: manual merge of the ttydev tree

[Dan Williams]

Alan Cox wrote:
> On Thu, 11 Dec 2008 17:26:45 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
>> Hi Alan,
>>
>> Today's linux-next merge of the ttydev tree got a conflict in
>> drivers/serial/8250.c between commit
>> 507ce132910803e8fd1116467e99f59da3d526f0 ("iop13xx: workaround errata
>> that causes uart interrupts to be missed") from the async_tx tree and
>> commit 63c4074301f79f1620d6c880973d6ef1cc770990
>> ("tty-serial-8250-regops") from the ttydev tree.
>>
>> I have reverted the async_tx commit for today. Please try to figure out
>> what should happen here.
> 
> Dan - can you feed the uart 8250 patches through the ttydev tree or are
> there dependancies on other parts of async_tx ?
> 


No, this purely my fault.  That is a debugging patch I use when testing 
my tree on iop13xx and I inadvertantly included it in my latest push to 
-next.  It has been removed.  Sorry for the noise.

Regards,
Dan

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/sierra.c between commit
4d7b9fc74ab5086b0ccc1f3dc28617c552263b7a ("USB Serial: Sierra: debug
message fix") from the usb tree and commit
6ae0d6ddae605af245c472aa574e2b4f834ce69c ("tty-usbserial-kref") from the
ttydev tree.

Just context modification.  I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/usb/serial/sierra.c
index 1a37286,7d9ab12..0000000
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@@ -438,18 -435,17 +438,18 @@@ static void sierra_indat_callback(struc
  	port =  urb->context;
  
  	if (status) {
 -		dbg("%s: nonzero status: %d on endpoint %02x.",
 -		    __func__, status, endpoint);
 +		dev_dbg(&port->dev, "%s: nonzero status: %d on"
 +		    " endpoint %02x.", __func__, status, endpoint);
  	} else {
- 		tty = port->port.tty;
  		if (urb->actual_length) {
+ 		tty = tty_port_tty_get(&port->port);
  			tty_buffer_request_room(tty, urb->actual_length);
  			tty_insert_flip_string(tty, data, urb->actual_length);
  			tty_flip_buffer_push(tty);
- 		} else {
+ 			tty_kref_put(tty);
+ 		} else
 -			dbg("%s: empty read urb received", __func__);
 +			dev_dbg(&port->dev, "%s: empty read urb"
 +				" received", __func__);
- 		}
  
  		/* Resubmit urb so we continue receiving */
  		if (port->port.count && status != -ESHUTDOWN) {
@@@ -489,9 -483,9 +489,10 @@@ static void sierra_instat_callback(stru
  			unsigned char signals = *((unsigned char *)
  					urb->transfer_buffer +
  					sizeof(struct usb_ctrlrequest));
+ 			struct tty_struct *tty;
  
 -			dbg("%s: signal x%x", __func__, signals);
 +			dev_dbg(&port->dev, "%s: signal x%x", __func__,
 +				signals);
  
  			old_dcd_state = portdata->dcd_state;
  			portdata->cts_state = 1;
@@@ -499,16 -493,17 +500,18 @@@
  			portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
  			portdata->ri_state = ((signals & 0x08) ? 1 : 0);
  
- 			if (port->port.tty && !C_CLOCAL(port->port.tty) &&
+ 			tty = tty_port_tty_get(&port->port);
+ 			if (tty && !C_CLOCAL(tty) &&
  					old_dcd_state && !portdata->dcd_state)
- 				tty_hangup(port->port.tty);
+ 				tty_hangup(tty);
+ 			tty_kref_put(tty);
  		} else {
 -			dbg("%s: type %x req %x", __func__,
 -				req_pkt->bRequestType, req_pkt->bRequest);
 +			dev_dbg(&port->dev, "%s: type %x req %x",
 +				__func__, req_pkt->bRequestType,
 +				req_pkt->bRequest);
  		}
  	} else
 -		dbg("%s: error %d", __func__, status);
 +		dev_dbg(&port->dev, "%s: error %d", __func__, status);
  
  	/* Resubmit urb so we continue receiving IRQ data */
  	if (status != -ESHUTDOWN) {

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/char/ip2/ip2main.c between commit
64dd9a65b282990a82d5ca0459e0be291f00270c ("device create: char: convert
device_create_drvdata to device_create") from the driver-core tree and
commit f9d65d9f1b0ad12c71771e1c47fb585da1f19818 ("ip2-cleanup-init") from
the ttydev tree.

I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/char/ip2/ip2main.c
index e215e0c,6774572..0000000
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@@ -705,23 -731,24 +731,24 @@@ static int __init ip2_loadmain(void
  	/* Register the read_procmem thing */
  	if (!proc_create("ip2mem",0,NULL,&ip2mem_proc_fops)) {
  		printk(KERN_ERR "IP2: failed to register read_procmem\n");
- 	} else {
+ 		return -EIO; /* leaking resources */
+ 	}
  
- 	ip2trace (ITRC_NO_PORT, ITRC_INIT, 4, 0 );
- 		/* Register the interrupt handler or poll handler, depending upon the
- 		 * specified interrupt.
- 		 */
+ 	ip2trace(ITRC_NO_PORT, ITRC_INIT, 4, 0);
+ 	/* Register the interrupt handler or poll handler, depending upon the
+ 	 * specified interrupt.
+ 	 */
  
- 		for( i = 0; i < IP2_MAX_BOARDS; ++i ) {
- 			if ( 0 == ip2config.addr[i] ) {
- 				continue;
- 			}
+ 	for (i = 0; i < IP2_MAX_BOARDS; ++i) {
+ 		if (ip2config.addr[i] == 0)
+ 			continue;
  
- 			if ( NULL != ( pB = i2BoardPtrTable[i] ) ) {
- 				device_create(ip2_class, NULL,
+ 		pB = i2BoardPtrTable[i];
+ 		if (pB != NULL) {
 -			device_create_drvdata(ip2_class, NULL,
++			device_create(ip2_class, NULL,
  					      MKDEV(IP2_IPL_MAJOR, 4 * i),
  					      NULL, "ipl%d", i);
- 				device_create(ip2_class, NULL,
 -			device_create_drvdata(ip2_class, NULL,
++			device_create(ip2_class, NULL,
  					      MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
  					      NULL, "stat%d", i);
  

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 629 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/char/tty_io.c between commit
e9b4b8816d7516318a3472f600ad9734e300c7bc ("device create: char: convert
device_create_drvdata to device_create") from the driver-core tree and
commit ee32c06e38600122f51aca2de893d1027251719a
("tty-move-special-cases") from the ttydev tree.

The latter moved some code that the former modified
(device_create_drvdata -> device_create changes).

I basically just used the version from the ttydev tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
Documentation/feature-removal-schedule.txt between commit
9bfd67f96a92f8853e77e028acfa93e737ffe2ad ("HID: add compat support") from
the hid tree and commit 4895f0191a229a864c701c5f38a967fbdd15a0e0
("mcfserial-goes-byebye") from the ttydev tree.

Just an overlapping add/remove.  I fixed it up (see below) and can carry
it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc Documentation/feature-removal-schedule.txt
index 81fc817,7781bf8..0000000
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -265,22 -265,7 +265,14 @@@ Why:	replaced by allowdac and no dac co
  Who:	Glauber Costa <gcosta@redhat.com>
  
  ---------------------------
- 
- What:	old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE)
- When:	2.6.28
- Why:	This driver still uses the old interface and has been replaced
- 	by CONFIG_SERIAL_MCF.
- Who:	Sebastian Siewior <sebastian@breakpoint.cc>
- 
- ---------------------------
  
 +What:	remove HID compat support
 +When:	2.6.29
 +Why:	needed only as a temporary solution until distros fix themselves up
 +Who:	Jiri Slaby <jirislaby@gmail.com>
 +
 +---------------------------
 +
  What:	/sys/o2cb symlink
  When:	January 2010
  Why:	/sys/fs/o2cb is the proper location for this information - /sys/o2cb

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/char/tty_io.c between commit
e9b4b8816d7516318a3472f600ad9734e300c7bc ("device create: char: convert
device_create_drvdata to device_create") from the driver-core tree and
commit 05d425154eb1c1c053be5e54dcc4b1db36b15d3b("tty-move-special-cases")
from the ttydev tree.

The former renamed a function used in the code that the latter moved.  I
fixed it up (see below).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index af2ab67..328e8ac 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -535,7 +535,7 @@ static void __init unix98_pty_init(void)
 	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
 		panic("Couldn't register /dev/ptmx driver\n");
-	device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
+	device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
 }
 
 #else
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 06a840d..2ec7bfe 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2931,7 +2931,7 @@ int __init vty_init(const struct file_operations *console_fops)
 	if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
 	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
 		panic("Couldn't register /dev/tty0 driver\n");
-	device_create_drvdata(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
+	device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
 
 	vcs_init();
 

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

Hi Alan,

Today's linux-next merge of the ttydev tree got trivial conflicts in
drivers/usb/serial/aircable.c and drivers/usb/serial/keyspan_pda.c
between commit 7b4dc5ed3acb8410fd078a6876d01c206af803ed ("USB: remove use
of err() in drivers/usb/serial") from the usb tree and commit
9c3656d0341bc2763b3f4abc9484776ff28c1c12 ("tty-usbserial-kref") from the
ttydev tree.

Just overlapping context of changes. I fixed it up (see below).  I assume
that the err -> dev_err changes could be added to your tree, Alan.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/usb/serial/aircable.c
index 27ea680,67dc982..0000000
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@@ -287,9 -287,8 +287,9 @@@ static void aircable_read(struct work_s
  
  	tty_prepare_flip_string(tty, &data, count);
  	if (!data) {
 -		err("%s- kzalloc(%d) failed.", __func__, count);
 +		dev_err(&port->dev, "%s- kzalloc(%d) failed.\n",
 +			__func__, count);
- 		return;
+ 		goto out;
  	}
  
  	serial_buf_get(priv->rx_buf, data, count);
diff --cc drivers/usb/serial/keyspan_pda.c
index 507f8bd,d799883..0000000
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@@ -261,9 -262,10 +262,11 @@@ static void keyspan_pda_rx_interrupt(st
  exit:
  	retval = usb_submit_urb(urb, GFP_ATOMIC);
  	if (retval)
 -		err("%s - usb_submit_urb failed with result %d",
 -		     __func__, retval);
 +		dev_err(&port->dev,
 +			"%s - usb_submit_urb failed with result %d\n",
 +			__func__, retval);
+ out:
+ 	tty_kref_put(tty);		     
  }
  
  

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Thu, 21 Aug 2008 18:03:08 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got trivial conflicts in
> drivers/usb/serial/aircable.c and drivers/usb/serial/keyspan_pda.c
> between commit 7b4dc5ed3acb8410fd078a6876d01c206af803ed ("USB: remove use
> of err() in drivers/usb/serial") from the usb tree and commit
> 9c3656d0341bc2763b3f4abc9484776ff28c1c12 ("tty-usbserial-kref") from the
> ttydev tree.
> 
> Just overlapping context of changes. I fixed it up (see below).  I assume
> that the err -> dev_err changes could be added to your tree, Alan.

I took that as a hint and have done so.

Re: linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 508 bytes --]

Hi Alan,

On Thu, 21 Aug 2008 11:21:51 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> On Thu, 21 Aug 2008 18:03:08 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Just overlapping context of changes. I fixed it up (see below).  I assume
> > that the err -> dev_err changes could be added to your tree, Alan.
> 
> I took that as a hint and have done so.

Great, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/char/tty_io.c between commit
8c9a9dd0fa3a269d380eaae2dc1bee39e865fae1 ("tty: remove resize window
special case") from Linus' tree (which appears to also be in the ttydev
tree as "tty-remove-resize-special") and commit
2283faa9cec083b6ddc1fa02a974ce1c797e847f ("tty-fix-pty-termios-race")
from the ttydev tree.

The latter is just further changes, so I took the ttydev tree version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/net/usb/hso.c between commit
e9690d2f637dd16bf20bc4d69b51ba72fb211822 ("hso: fix oops in read/write
callbacks") from the usb tree and commit
37a8d3fef248ae274c93974972469e0c36e21f73 ("tty-kref-hso") from the ttydev
tree.

Overlapping fixes.  I fixed them up as seemed obvious.

[Alan, I assume your patches will get better changelogs ...]
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 516 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/class/cdc-acm.c between commit
9e02103a5b182c5c99aaa8efa1def46bd215c707 ("usb: cdc-acm: stop dropping tx
buffers") from the usb.current tree and commit
1b873c25c7cb1571784626ce044b63a28909e288 ("tty-fix-cdc-acm") from the
ttydev tree.

The former removed a line that the latter modified.  I just removed the
line.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Greg KH]

On Tue, Aug 12, 2008 at 04:58:30PM +1000, Stephen Rothwell wrote:
> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/class/cdc-acm.c between commit
> 9e02103a5b182c5c99aaa8efa1def46bd215c707 ("usb: cdc-acm: stop dropping tx
> buffers") from the usb.current tree and commit
> 1b873c25c7cb1571784626ce044b63a28909e288 ("tty-fix-cdc-acm") from the
> ttydev tree.
> 
> The former removed a line that the latter modified.  I just removed the
> line.

Sounds correct to me, thanks for doing that.

greg k-h

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/char/tty_io.c between commit
000b9151d7851cc1e490b2a76d0206e524f43cca ("Fix race/oops in tty layer
after BKL pushdown") from Linus' tree and commit
b3cfb0b9b2a6ca9d0bf8708688328ed65ce1ba99 ("tty-kref-get-current-tty")
from the ttydev tree.

It is just a contextual conflict (the former moved a line next to a
comment removed by the latter).  I fixed it up.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 444 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got several conflicts in 6
files.  Since you said that it has all been merged into Linus' tree, I
have dropped it for today.

Could you please update the tree to reflect what has been merged upstream
(i.e. just leave an empty series file if there is nothing new).  Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got conflicts in
drivers/char/istallion.c, drivers/char/mxser.c, drivers/char/specialix.c,
drivers/char/synclink_gt.c, drivers/char/tty_io.c,
drivers/usb/gadget/serial.c, drivers/usb/serial/cp2101.c,
drivers/usb/serial/io_ti.c, drivers/usb/serial/ir-usb.c,
drivers/usb/serial/usb-serial.c, include/linux/tty.h and
net/bluetooth/rfcomm/tty.c mainly against Linus' tree.

This is not unexpected since some of the ttydev tree has been merged, so I
will drop it for today in the hope that things are better tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Tue, 22 Jul 2008 16:37:54 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got conflicts in
> drivers/char/istallion.c, drivers/char/mxser.c, drivers/char/specialix.c,
> drivers/char/synclink_gt.c, drivers/char/tty_io.c,
> drivers/usb/gadget/serial.c, drivers/usb/serial/cp2101.c,
> drivers/usb/serial/io_ti.c, drivers/usb/serial/ir-usb.c,
> drivers/usb/serial/usb-serial.c, include/linux/tty.h and
> net/bluetooth/rfcomm/tty.c mainly against Linus' tree.
> 
> This is not unexpected since some of the ttydev tree has been merged, so I
> will drop it for today in the hope that things are better tomorrow.

I've fired the rest of the ttydev tree at Linus this morning now that
clashing stuff seems to have stopped being merged for a few hours. At
that point the ttydev tree should be empty. Andrew will push a few ip2
patches directly. Hopefully now there is a real tty devel tree it'll have
less clashes in future.

Thanks for the help in getting started with linux-next btw.

Alan

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got conflicts in
drivers/usb/gadget/serial.c between commit
4d5d46818a74ff3bf7d7cedb9ecc3f0c362a1275 ("usb gadget: use new serial
core") from the usb tree and commit
7ba6ca8da2aca59d29196b7df3f71b0175354644 ("tty-gs-remove-break") from the
ttydev tree.

I used the usb tree version as it seemed to have removed the use of
break_ctl anyway.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/usb-serial.c between commit
f26eeced85fb3bdce383febcbb064147d5e15e91 ("USB: fix usb serial pm counter
decrement for disconnected interfaces") from the usb tree and commit
serial_close ("usb-serial-api-change") from the ttydev tree.

A simple context conflict which I fixed up and can carry the fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/ir-usb.c between commit
0da89a4824f8d59efea82f84e197cc7d6f218cbf ("usb: irda: cleanup on ir-usb
module") from the usb tree and commit
255ba432f804717e8a2d6096aa2d92e970f61c3d ("usb-serial-api-change") from
the ttydev tree.

I used the ttydev version.  Worth a check to see if I got it right after
I publish the tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/cp2101.c between commit
b147c3a769995335107b4cd674bd2d1e1493ddfb ("USB: cp2101.c fix sparse
signedness mismatch warnings") from the usb tree and commit
255ba432f804717e8a2d6096aa2d92e970f61c3d ("usb-serial-api-change") from
the ttydev tree.

I did the obvious fixup and can carry it.  (the conflict is below)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/airprime.c between commit
0cc220d6bfe0d92843868a8dd4f0bd427fe6d8e2 ("USB: delete airprime driver")
from the usb tree and commit 255ba432f804717e8a2d6096aa2d92e970f61c3d
("usb-serial-api-change") from the ttydev tree.

I just removed the file.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/net/wireless/strip.c between commit
94d9842403f770239a656586442454b7a8f2df29 ("remove the strip driver") from
the wireless tree and commit 08bec19ee22b6d02bf354323e6b5a3e61070c04a
("tty-fix-strip") from the ttydev tree.

I just removed the file for now.

I think I remember some discussion of this a while ago ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Fri, 18 Jul 2008 18:20:15 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/net/wireless/strip.c between commit
> 94d9842403f770239a656586442454b7a8f2df29 ("remove the strip driver") from
> the wireless tree and commit 08bec19ee22b6d02bf354323e6b5a3e61070c04a
> ("tty-fix-strip") from the ttydev tree.
> 
> I just removed the file for now.
> 
> I think I remember some discussion of this a while ago ...


Yes - the strip driver should not be getting dropped. I asked Adrian to
stop this. I am suprised he hasn't done so.

Alan

Re: linux-next: manual merge of the ttydev tree

[Adrian Bunk]

On Fri, Jul 18, 2008 at 09:49:12AM +0100, Alan Cox wrote:
> On Fri, 18 Jul 2008 18:20:15 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi Alan,
> > 
> > Today's linux-next merge of the ttydev tree got a conflict in
> > drivers/net/wireless/strip.c between commit
> > 94d9842403f770239a656586442454b7a8f2df29 ("remove the strip driver") from
> > the wireless tree and commit 08bec19ee22b6d02bf354323e6b5a3e61070c04a
> > ("tty-fix-strip") from the ttydev tree.
> > 
> > I just removed the file for now.
> > 
> > I think I remember some discussion of this a while ago ...
> 
> 
> Yes - the strip driver should not be getting dropped. I asked Adrian to
> stop this. I am suprised he hasn't done so.

mea culpa

That got lost somewhere in my linux-kernel folder.

John, can you either drop my commit or add a revert commit for the 
driver removal commit?

> Alan

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: linux-next: manual merge of the ttydev tree

[David Miller]

From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 18 Jul 2008 13:49:54 +0300

> John, can you either drop my commit or add a revert commit for the 
> driver removal commit?

It's in my tree already, I'll revert.

Re: linux-next: manual merge of the ttydev tree

[Adrian Bunk]

On Fri, Jul 18, 2008 at 03:55:20AM -0700, David Miller wrote:
> From: Adrian Bunk <bunk@kernel.org>
> Date: Fri, 18 Jul 2008 13:49:54 +0300
> 
> > John, can you either drop my commit or add a revert commit for the 
> > driver removal commit?
> 
> It's in my tree already, I'll revert.

thanks

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

Hi Alan,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/char/tty_io.c between commit
3e2a078ca6a0d3122bbf2b904cd7ccf21a5ca21d ("tty: Fix inverted logic in
send_break") from Linus' tree and "77-tty-break-errorhandler" from the
ttydev tree.

I made the obvious fixup.  Please redo the patch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Fri, 4 Jul 2008 19:11:34 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the hdlc tree got a conflict in
> drivers/char/tty_io.c between commit
> 3e2a078ca6a0d3122bbf2b904cd7ccf21a5ca21d ("tty: Fix inverted logic in
> send_break") from Linus' tree and "77-tty-break-errorhandler" from the
> ttydev tree.
> 
> I made the obvious fixup.  Please redo the patch.

Done but that meant shifting the base of the patch as it is now in
linux-next so can't be relative to it. I've put it on top of the firmware
tree as that should avoid the conflicts I'm aware of

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/ti_fw_3410.h and drivers/usb/serial/ti_fw_5052.h
between commit 01f845d09b8fdcdd27ee592422567b8dfa5b14d5
("ti_usb_3410_5052: use request_firmware()") from the firmware tree and
commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f
("23-usb-serial-api-change") from the ttydev tree.

The former removed the files.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Wed, 2 Jul 2008 00:12:34 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/serial/ti_fw_3410.h and drivers/usb/serial/ti_fw_5052.h
> between commit 01f845d09b8fdcdd27ee592422567b8dfa5b14d5
> ("ti_usb_3410_5052: use request_firmware()") from the firmware tree and
> commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f
> ("23-usb-serial-api-change") from the ttydev tree.
> 
> The former removed the files.

Relevant changes dropped from my tree

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in drivers/usb/serial/airprime.c between commit 31c3b66aea5816d8c9406a272de71ea474ef86b5 ("USB: delete airprime driver") from the usb tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") from the ttydev tree.

The former removed the file.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Wed, 2 Jul 2008 00:09:51 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in drivers/usb/serial/airprime.c between commit 31c3b66aea5816d8c9406a272de71ea474ef86b5 ("USB: delete airprime driver") from the usb tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") from the ttydev tree.
> 
> The former removed the file.

Will drop out of my patch

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 438 bytes --]

Hi ,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/net/wireless/strip.c between commit
94d9842403f770239a656586442454b7a8f2df29 ("remove the strip driver") from
the net tree and commit 7636d4eb65deca18568e3ec4bfa65b85078042ce
("01-ldisc-ref") from the ttydev tree.

The former removed the file.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Wed, 2 Jul 2008 00:07:12 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi ,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/net/wireless/strip.c between commit
> 94d9842403f770239a656586442454b7a8f2df29 ("remove the strip driver") from
> the net tree and commit 7636d4eb65deca18568e3ec4bfa65b85078042ce
> ("01-ldisc-ref") from the ttydev tree.
> 
> The former removed the file.

Perhaps whoever removed the file would care to talk to the tty driver
maintainer before doing so - please drop the strip driver removal. It
still has a couple of users

Re: linux-next: manual merge of the ttydev tree

[Adrian Bunk]

On Tue, Jul 01, 2008 at 03:12:05PM +0100, Alan Cox wrote:
> On Wed, 2 Jul 2008 00:07:12 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi ,
> > 
> > Today's linux-next merge of the ttydev tree got a conflict in
> > drivers/net/wireless/strip.c between commit
> > 94d9842403f770239a656586442454b7a8f2df29 ("remove the strip driver") from
> > the net tree and commit 7636d4eb65deca18568e3ec4bfa65b85078042ce
> > ("01-ldisc-ref") from the ttydev tree.
> > 
> > The former removed the file.
> 
> Perhaps whoever removed the file would care to talk to the tty driver
> maintainer before doing so - please drop the strip driver removal. It
> still has a couple of users

When we discussed the removal of the driver we weren't able to find any 
realistic chance that people both have this hardware and this kind of 
wireless network.

What users do you know about?

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

> When we discussed the removal of the driver we weren't able to find any 
> realistic chance that people both have this hardware and this kind of 
> wireless network.
> 
> What users do you know about?

The modems worked both with base stations but they also support working
as an adhoc star mode network and yes - people still use them for that in
interesting places where 802.11 doesn't work nicely. And I got bug
reports.. You can still plug em into a PC today and build ad-hoc star
networks including funky stuff like dual modem full dupex.

Of course if you'd bothered to discuss it anywhere I can find or read you
might have found that out earlier.

Alan

Re: linux-next: manual merge of the ttydev tree

[Adrian Bunk]

On Tue, Jul 01, 2008 at 04:42:20PM +0100, Alan Cox wrote:
> > When we discussed the removal of the driver we weren't able to find any 
> > realistic chance that people both have this hardware and this kind of 
> > wireless network.
> > 
> > What users do you know about?
> 
> The modems worked both with base stations but they also support working
> as an adhoc star mode network and yes - people still use them for that in
> interesting places where 802.11 doesn't work nicely. And I got bug
> reports.. You can still plug em into a PC today and build ad-hoc star
> networks including funky stuff like dual modem full dupex.
> 
> Of course if you'd bothered to discuss it anywhere I can find or read you
> might have found that out earlier.

It was discussed on linux-wireless which seems to be the appropriate 
place for a driver under drivers/net/wireless/

If you consider yourself the maintainer of this driver, can you dump 
the non-working URL from the MAINTAINERS entry (whose removal was my 
original patch) and add yourself instead?

> Alan

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/whiteheat.c between commit
018a04cf1bff6e940600f1b65a147607f10d3a47 ("whiteheat: use request_firmware
()") from the firmware tree and commit
70f8e6e2b768df1105eea0a8ebf33527de9eae34 ("24-whiteheat-coding-style")
from the ttydev tree.

I basically took the firmware tree's version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

[Just added some cc's]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/usb-serial.c between commits
0eb943841bdeb2210058e899cef11f6084bedf82 ("USB: usb dev_name() instead of
dev->bus_id"), c19b07f9e5990423131d0435b303e572dc3132d0 ("USB: usb
dev_set_name() instead of dev->bus_id") and
26a8abb358ae6110b8c46afc40a85e6f47bc8eeb ("USB: fix usb serial pm counter
decrement for disconnected interfaces") from the usb tree and commit
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
ca66d73b800beb3bd391d9109ee13612755305cf ("44-tty-tidy-usb-serial")from
the ttydev tree.

The fixups were fairy obvious.  I can carry them.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/


[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 779 bytes --]

Hi ,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/usb-serial.c between commits
0eb943841bdeb2210058e899cef11f6084bedf82 ("USB: usb dev_name() instead of
dev->bus_id"), c19b07f9e5990423131d0435b303e572dc3132d0 ("USB: usb
dev_set_name() instead of dev->bus_id") and
26a8abb358ae6110b8c46afc40a85e6f47bc8eeb ("USB: fix usb serial pm counter
decrement for disconnected interfaces") from the usb tree and commit
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
ca66d73b800beb3bd391d9109ee13612755305cf ("44-tty-tidy-usb-serial")from
the ttydev tree.

The fixups were fairy obvious.  I can carry them.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 614 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/ti_usb_3410_5052.c between commit
01f845d09b8fdcdd27ee592422567b8dfa5b14d5 ("ti_usb_3410_5052: use
request_firmware()") from the firmware tree and commits
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
b002e3f7c9249ddfd1d166cdb76cf7dde8dd93a2 ("62-tty-tidy-usb-ti-usb") from
the ttydev tree.

I fixed it up as best I could.  Definitely worth a look to see if I got
it right.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/keyspan_pda.c between commit
c81a074df394cba95767e7a8c2bf50c0ba1efd0e ("keyspan_pda: use
request_firmware()") from the firmware tree and commit
657f03fb0d6fa2ceb2c7d5417e7fd8a66df6e028 ("52-tty-tidy-usb-keyspan-pda")
from the ttydev tree.

Same as for keyspan.c.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Tue, 1 Jul 2008 22:43:00 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/serial/keyspan_pda.c between commit
> c81a074df394cba95767e7a8c2bf50c0ba1efd0e ("keyspan_pda: use
> request_firmware()") from the firmware tree and commit
> 657f03fb0d6fa2ceb2c7d5417e7fd8a66df6e028 ("52-tty-tidy-usb-keyspan-pda")
> from the ttydev tree.
> 
> Same as for keyspan.c.

David - I think this is what you need to make your firmware tree fit on
top of the ttydev tree

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 8c7dc40..707fdcb 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -105,6 +105,8 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <linux/firmware.h>
+#include <linux/ihex.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
@@ -1340,8 +1342,9 @@ static void keyspan_close(struct tty_struct *tty,
 static int keyspan_fake_startup(struct usb_serial *serial)
 {
 	int 				response;
-	const struct ezusb_hex_record 	*record;
+	const struct ihex_binrec 	*record;
 	char				*fw_name;
+	const struct firmware		*fw;
 
 	dbg("Keyspan startup version %04x product %04x",
 	    le16_to_cpu(serial->dev->descriptor.bcdDevice),
@@ -1356,72 +1359,60 @@ static int keyspan_fake_startup(struct usb_serial *serial)
 		/* Select firmware image on the basis of idProduct */
 	switch (le16_to_cpu(serial->dev->descriptor.idProduct)) {
 	case keyspan_usa28_pre_product_id:
-		record = &keyspan_usa28_firmware[0];
-		fw_name = "USA28";
+		fw_name = "keyspan/usa28.fw";
 		break;
 
 	case keyspan_usa28x_pre_product_id:
-		record = &keyspan_usa28x_firmware[0];
-		fw_name = "USA28X";
+		fw_name = "keyspan/usa28x.fw";
 		break;
 
 	case keyspan_usa28xa_pre_product_id:
-		record = &keyspan_usa28xa_firmware[0];
-		fw_name = "USA28XA";
+		fw_name = "keyspan/usa28xa.fw";
 		break;
 
 	case keyspan_usa28xb_pre_product_id:
-		record = &keyspan_usa28xb_firmware[0];
-		fw_name = "USA28XB";
+		fw_name = "keyspan/usa28xb.fw";
 		break;
 
 	case keyspan_usa19_pre_product_id:
-		record = &keyspan_usa19_firmware[0];
-		fw_name = "USA19";
+		fw_name = "keyspan/usa19.fw";
 		break;
 
 	case keyspan_usa19qi_pre_product_id:
-		record = &keyspan_usa19qi_firmware[0];
-		fw_name = "USA19QI";
+		fw_name = "keyspan/usa19qi.fw";
 		break;
 
 	case keyspan_mpr_pre_product_id:
-		record = &keyspan_mpr_firmware[0];
-		fw_name = "MPR";
+		fw_name = "keyspan/mpr.fw";
 		break;
 
 	case keyspan_usa19qw_pre_product_id:
-		record = &keyspan_usa19qw_firmware[0];
-		fw_name = "USA19QI";
+		fw_name = "keyspan/usa19qw.fw";
 		break;
 
 	case keyspan_usa18x_pre_product_id:
-		record = &keyspan_usa18x_firmware[0];
-		fw_name = "USA18X";
+		fw_name = "keyspan/usa18x.fw";
 		break;
 
 	case keyspan_usa19w_pre_product_id:
-		record = &keyspan_usa19w_firmware[0];
-		fw_name = "USA19W";
+		fw_name = "keyspan/usa19w.fw";
 		break;
 
 	case keyspan_usa49w_pre_product_id:
-		record = &keyspan_usa49w_firmware[0];
-		fw_name = "USA49W";
+		fw_name = "keyspan/usa49w.fw";
 		break;
 
 	case keyspan_usa49wlc_pre_product_id:
-		record = &keyspan_usa49wlc_firmware[0];
-		fw_name = "USA49WLC";
+		fw_name = "keyspan/usa49wlc.fw";
 		break;
 
 	default:
-		record = NULL;
-		fw_name = "Unknown";
-		break;
+		dev_err(&serial->dev->dev, "Unknown product ID (%04x)\n",
+			le16_to_cpu(serial->dev->descriptor.idProduct));
+		return 1;
 	}
 
-	if (record == NULL) {
+	if (request_ihex_firmware(&fw, fw_name, &serial->dev->dev)) {
 		dev_err(&serial->dev->dev,
 			"Required keyspan firmware image (%s) unavailable.\n",
 								fw_name);
@@ -1433,22 +1424,24 @@ static int keyspan_fake_startup(struct usb_serial *serial)
 		/* download the firmware image */
 	response = ezusb_set_reset(serial, 1);
 
-	while (record->address != 0xffff) {
-		response = ezusb_writememory(serial, record->address,
+	record = (const struct ihex_binrec *)fw->data;
+
+	while (record) {
+		response = ezusb_writememory(serial, be32_to_cpu(record->addr),
 					     (unsigned char *)record->data,
-					     record->data_size, 0xa0);
+					     be16_to_cpu(record->len), 0xa0);
 		if (response < 0) {
 			dev_err(&serial->dev->dev,
 				"ezusb_writememory failed for Keyspan firmware (%d %04X %p %d)\n",
-				response,
-				record->address, record->data,
-				record->data_size);
+				response, be32_to_cpu(record->addr),
+				record->data, be16_to_cpu(record->len));
 			break;
 		}
-		record++;
+		record = ihex_next_binrec(record);
 	}
-		/* bring device out of reset. Renumeration will occur in a
-		   moment and the new device will bind to the real driver */
+	release_firmware(fw);
+	/* bring device out of reset. Renumeration will occur in a
+	   moment and the new device will bind to the real driver */
 	response = ezusb_set_reset(serial, 0);
 
 	/* we don't want this device to have a driver assigned to it. */
@@ -2747,6 +2740,19 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
+MODULE_FIRMWARE("keyspan/usa28.fw");
+MODULE_FIRMWARE("keyspan/usa28x.fw");
+MODULE_FIRMWARE("keyspan/usa28xa.fw");
+MODULE_FIRMWARE("keyspan/usa28xb.fw");
+MODULE_FIRMWARE("keyspan/usa19.fw");
+MODULE_FIRMWARE("keyspan/usa19qi.fw");
+MODULE_FIRMWARE("keyspan/mpr.fw");
+MODULE_FIRMWARE("keyspan/usa19qw.fw");
+MODULE_FIRMWARE("keyspan/usa18x.fw");
+MODULE_FIRMWARE("keyspan/usa19w.fw");
+MODULE_FIRMWARE("keyspan/usa49w.fw");
+MODULE_FIRMWARE("keyspan/usa49wlc.fw");
+
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug enabled or not");
 

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 928f545..ef81071 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -78,18 +78,14 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
+#include <linux/firmware.h>
+#include <linux/ihex.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
 static int debug;
 
-struct ezusb_hex_record {
-	__u16 address;
-	__u8 data_size;
-	__u8 data[16];
-};
-
 /* make a simple define to handle if we are compiling keyspan_pda
    or xircom support */
 #if defined(CONFIG_USB_SERIAL_KEYSPAN_PDA) || defined(CONFIG_USB_SERIAL_KEYSPAN_PDA_MODULE)
@@ -103,14 +99,6 @@ struct ezusb_hex_record {
 	#undef XIRCOM
 #endif
 
-#ifdef KEYSPAN
-#include "keyspan_pda_fw.h"
-#endif
-
-#ifdef XIRCOM
-#include "xircom_pgs_fw.h"
-#endif
-
 /*
  * Version Information
  */
@@ -734,38 +722,47 @@ static void keyspan_pda_close(struct tty_struct *tty,
 static int keyspan_pda_fake_startup(struct usb_serial *serial)
 {
 	int response;
-	const struct ezusb_hex_record *record = NULL;
+	const char *fw_name;
+	const struct ihex_binrec *record;
+	const struct firmware *fw;
 
 	/* download the firmware here ... */
 	response = ezusb_set_reset(serial, 1);
 
+	if (0) { ; }
 #ifdef KEYSPAN
-	if (le16_to_cpu(serial->dev->descriptor.idVendor) == KEYSPAN_VENDOR_ID)
-		record = &keyspan_pda_firmware[0];
+	else if (le16_to_cpu(serial->dev->descriptor.idVendor) == KEYSPAN_VENDOR_ID)
+		fw_name = "keyspan_pda/keyspan_pda.fw";
 #endif
 #ifdef XIRCOM
-	if ((le16_to_cpu(serial->dev->descriptor.idVendor) == XIRCOM_VENDOR_ID) ||
-	    (le16_to_cpu(serial->dev->descriptor.idVendor) == ENTREGRA_VENDOR_ID))
-		record = &xircom_pgs_firmware[0];
+	else if ((le16_to_cpu(serial->dev->descriptor.idVendor) == XIRCOM_VENDOR_ID) ||
+		 (le16_to_cpu(serial->dev->descriptor.idVendor) == ENTREGRA_VENDOR_ID))
+		fw_name = "keyspan_pda/xircom_pgs.fw";
 #endif
-	if (record == NULL) {
+	else {
 		err("%s: unknown vendor, aborting.", __func__);
 		return -ENODEV;
 	}
+	if (request_ihex_firmware(&fw, fw_name, &serial->dev->dev)) {
+		err("failed to load firmware \"%s\"\n", fw_name);
+		return -ENOENT;
+	}
+	record = (const struct ihex_binrec *)fw->data;
 
 	while (record->address != 0xffff) {
 		response = ezusb_writememory(serial, record->address,
 					     (unsigned char *)record->data,
-					     record->data_size, 0xa0);
+					     be16_to_cpu(record->len), 0xa0);
 		if (response < 0) {
 			err("ezusb_writememory failed for Keyspan PDA "
 			    "firmware (%d %04X %p %d)",
-			    response,
-			    record->address, record->data, record->data_size);
+			    response, be32_to_cpu(record->addr),
+			    record->data, be16_to_cpu(record->len));
 			break;
 		}
-		record++;
+		record = ihex_next_binrec(record);
 	}
+	release_firmware(fw);
 	/* bring device out of reset. Renumeration will occur in a moment
 	   and the new device will bind to the real driver */
 	response = ezusb_set_reset(serial, 0);

Re: linux-next: manual merge of the ttydev tree

[David Woodhouse]

On Tue, 2008-07-01 at 15:09 +0100, Alan Cox wrote:
> David - I think this is what you need to make your firmware tree fit
> on top of the ttydev tree

Hm. Is there anything I can usefully do with that, without just pulling
the ttydev tree into mine? I think that's more useful for Stephen as a
resolution to the conflict, isn't it?

-- 
dwmw2

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Tue, 01 Jul 2008 16:07:25 +0100
David Woodhouse <dwmw2@infradead.org> wrote:

> On Tue, 2008-07-01 at 15:09 +0100, Alan Cox wrote:
> > David - I think this is what you need to make your firmware tree fit
> > on top of the ttydev tree
> 
> Hm. Is there anything I can usefully do with that, without just pulling
> the ttydev tree into mine? I think that's more useful for Stephen as a
> resolution to the conflict, isn't it?

Doesn't help. The ttydev tree needs to be in firmware, usb, trivial, net
and half a dozen other trees right now at once. Unfortunately people have
dumped tty and serial fixes all over other trees (even randomly deleted
drivers that are in use!) because there wasn't a tty tree to handle it.

Best bet for the moment I still think is to build ttydev on top of the
merge for the moment, and then it'll sort out. I see no other sane way to
do it unless Stephen has some good ideas ?

Alan

Re: linux-next: manual merge of the ttydev tree

[David Woodhouse]

On Tue, 2008-07-01 at 16:29 +0100, Alan Cox wrote:
> On Tue, 01 Jul 2008 16:07:25 +0100
> David Woodhouse <dwmw2@infradead.org> wrote:
> 
> > On Tue, 2008-07-01 at 15:09 +0100, Alan Cox wrote:
> > > David - I think this is what you need to make your firmware tree fit
> > > on top of the ttydev tree
> > 
> > Hm. Is there anything I can usefully do with that, without just pulling
> > the ttydev tree into mine? I think that's more useful for Stephen as a
> > resolution to the conflict, isn't it?
> 
> Doesn't help. The ttydev tree needs to be in firmware, usb, trivial, net
> and half a dozen other trees right now at once.

Yeah, pulling your tree into mine isn't really an option -- hence asking
if there's anything useful I can do without it.

>  Unfortunately people have dumped tty and serial fixes all over other
> trees (even randomly deleted drivers that are in use!) because there
> wasn't a tty tree to handle it.

Fun :)

> Best bet for the moment I still think is to build ttydev on top of the
> merge for the moment, and then it'll sort out. I see no other sane way to
> do it unless Stephen has some good ideas ?

One option is perhaps to split up my patches into two parts -- the part
which modifies the driver to use request_firmware() (and removes the old
version of the firmware), and the part which adds the firmware back in
the firmware/ directory. You could carry the first patch, while I carry
the second.

-- 
dwmw2

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

> One option is perhaps to split up my patches into two parts -- the part
> which modifies the driver to use request_firmware() (and removes the old
> version of the firmware), and the part which adds the firmware back in
> the firmware/ directory. You could carry the first patch, while I carry
> the second.

What I've done for now is regenerated the diffs versus the firmware tree.
That means the firmware tree has to get thrown at Linus first (or I have
to regenerate it later without) but that itself isn't a big problem and
means that ttydev is now in -next and can actually get a good testing.

Right now its all non urgent bits so that should work out

Alan

Re: linux-next: manual merge of the ttydev tree

[David Woodhouse]

On Wed, 2008-07-02 at 10:17 +0100, Alan Cox wrote:
> > One option is perhaps to split up my patches into two parts -- the part
> > which modifies the driver to use request_firmware() (and removes the old
> > version of the firmware), and the part which adds the firmware back in
> > the firmware/ directory. You could carry the first patch, while I carry
> > the second.
> 
> What I've done for now is regenerated the diffs versus the firmware tree.
> That means the firmware tree has to get thrown at Linus first (or I have
> to regenerate it later without) but that itself isn't a big problem and
> means that ttydev is now in -next and can actually get a good testing.

Ok. I plan to throw it at Linus as soon as he opens the merge window,
anyway.

Are you using git, or patches? I've been going back and recommitting
stuff rather than committing incremental patches, which has much the
same effect as rebasing.

I was doing that on the basis that I had nobody 'downstream' pulling
from the tree. If you are doing that though, then I can stop (which
isn't much of an issue for me; I've fairly much stopped going back and
rewriting parts of it anyway).

-- 
dwmw2

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

> Are you using git, or patches? I've been going back and recommitting
> stuff rather than committing incremental patches, which has much the
> same effect as rebasing.

Patch stacks so no problem.

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/keyspan.c between commit
722051ff031346b1afd9008455d0b7eacfaa7c36 ("keyspan: use request_firmware
()") from the firmware tree and commit
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change")
from the ttydev tree.

The only real conflict was with the includes.  For the rest, I put the
firmware changes in over the tidyups.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 631 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/ir-usb.c between commit
3128101cf92692e300fdb8bf66a9e8f286cbaa7f ("usb: irda: cleanup on ir-usb
module") from the usb tree and commits
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
ad58854921eeeab97a09600260ea03fa097394e4 ("48-tty-tidy-usb-ir-usb") from
the ttydev tree.

I didn't even know where to start :-(, so I used the version from the
ttydev tree (since the other is just a cleanup).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Felipe Balbi]

On Tue, 1 Jul 2008 21:57:13 +1000, Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/serial/ir-usb.c between commit
> 3128101cf92692e300fdb8bf66a9e8f286cbaa7f ("usb: irda: cleanup on ir-usb
> module") from the usb tree and commits
> ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
> ad58854921eeeab97a09600260ea03fa097394e4 ("48-tty-tidy-usb-ir-usb") from
> the ttydev tree.
> 
> I didn't even know where to start :-(, so I used the version from the
> ttydev tree (since the other is just a cleanup).

Greg, should i refresh the patch and resend ?

-- 
Best Regards,

Felipe Balbi
http://blog.felipebalbi.com
me@felipebalbi.com

Re: linux-next: manual merge of the ttydev tree

[Greg KH]

On Tue, Jul 01, 2008 at 06:59:00AM -0500, Felipe Balbi wrote:
> 
> 
> On Tue, 1 Jul 2008 21:57:13 +1000, Stephen Rothwell <sfr@canb.auug.org.au>
> wrote:
> > Hi Alan,
> > 
> > Today's linux-next merge of the ttydev tree got a conflict in
> > drivers/usb/serial/ir-usb.c between commit
> > 3128101cf92692e300fdb8bf66a9e8f286cbaa7f ("usb: irda: cleanup on ir-usb
> > module") from the usb tree and commits
> > ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
> > ad58854921eeeab97a09600260ea03fa097394e4 ("48-tty-tidy-usb-ir-usb") from
> > the ttydev tree.
> > 
> > I didn't even know where to start :-(, so I used the version from the
> > ttydev tree (since the other is just a cleanup).
> 
> Greg, should i refresh the patch and resend ?

No, your patch is fine, the tty tree should be able to handle this.

thanks,

greg k-h

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/io_ti.c between commit
47794b33055da7b52e6718bc97258c95cba8cd67 ("USB: io_ti: FIrst cut at a big
clean up") from the usb tree (the equivalent of which appears to be in
the ttydev tee as well) and commit
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change")
from the ttydev tree.

There were many conflicts, so I just use the version from the ttydev tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a trivial conflict in
drivers/usb/serial/io_fw_down3.h between commit
47794b33055da7b52e6718bc97258c95cba8cd67 ("USB: io_ti: FIrst cut at a big
clean up") from the usb tree and commit
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change")
from the ttydev tree.

The same change has happened but with a simple white space difference.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 576 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/ftdi_sio.c between commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f
("23-usb-serial-api-change") from the ttydev tree.

The conflict is just in a comment.  I have applied the spelling
correction from the former to the version of the file from the ttydev
tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Jesper Juhl]

2008/7/1 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Alan,
>
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/serial/ftdi_sio.c between commit
> 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
> from the trivial tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f
> ("23-usb-serial-api-change") from the ttydev tree.
>
> The conflict is just in a comment.  I have applied the spelling
> correction from the former to the version of the file from the ttydev
> tree.
>
Ok, do you want me to make any changes to the contents of Trivial or
can I just leave thins as-is?

-- 
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Sat, 12 Jul 2008 20:59:58 +0200
"Jesper Juhl" <jesper.juhl@gmail.com> wrote:

> 2008/7/1 Stephen Rothwell <sfr@canb.auug.org.au>:
> > Hi Alan,
> >
> > Today's linux-next merge of the ttydev tree got a conflict in
> > drivers/usb/serial/ftdi_sio.c between commit
> > 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
> > from the trivial tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f
> > ("23-usb-serial-api-change") from the ttydev tree.
> >
> > The conflict is just in a comment.  I have applied the spelling
> > correction from the former to the version of the file from the ttydev
> > tree.
> >
> Ok, do you want me to make any changes to the contents of Trivial or
> can I just leave thins as-is?

Can you pull the change from trivial and email it to me and I'll merge it
nicely into ttydev

Alan

Re: linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

Hi Jesper,

On Sat, 12 Jul 2008 20:59:58 +0200 "Jesper Juhl" <jesper.juhl@gmail.com> wrote:
>
> 2008/7/1 Stephen Rothwell <sfr@canb.auug.org.au>:
> > Hi Alan,
> >
> > Today's linux-next merge of the ttydev tree got a conflict in
> > drivers/usb/serial/ftdi_sio.c between commit
> > 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
> > from the trivial tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f
> > ("23-usb-serial-api-change") from the ttydev tree.
> >
> > The conflict is just in a comment.  I have applied the spelling
> > correction from the former to the version of the file from the ttydev
> > tree.
> >
> Ok, do you want me to make any changes to the contents of Trivial or
> can I just leave thins as-is?

It is fine as is.  Alan has fixed it up for now.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/digi_acceleport.c between commit
6eccba01fa8ba0cfacca64297fc15f7d4077386e ("USB: remove CVS keywords")
from the usb tree and commit 44234195121820158769cdc2cc92e080dd94d8fe
("34-tty-tidy-usb-digi-acceleport") from the ttydev tree.

The former just removes the CVS annotation in the header comments which
are reformatted in the latter and also removes the CVS annotation.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 576 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/cp2101.c between commit
d79161478cea51d1ea3c470c26c9999e228761f2 ("USB: cp2101.c fix sparse
signedness mismatch warnings") from the usb tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") from
the ttydev tree.

I have used the version of this file from the ttydev tree with the
addition of the signedness changes from the usb tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/gadget/serial.c between commit
d4013f65e6b7be39e93845c280482e3f1d7894f0 ("usb gadget: use new serial
core") from the usb tree and commit
e806c01e6c8cacf955620105398902698ec3d933 ("79-tty-break-errorhandler")
from the ttydev tree.

The former patch removes the code modified by the latter.  I have used
the version from the usb tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

On Tue, 1 Jul 2008 21:10:03 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/gadget/serial.c between commit
> d4013f65e6b7be39e93845c280482e3f1d7894f0 ("usb gadget: use new serial
> core") from the usb tree and commit
> e806c01e6c8cacf955620105398902698ec3d933 ("79-tty-break-errorhandler")
> from the ttydev tree.
> 
> The former patch removes the code modified by the latter.  I have used
> the version from the usb tree.

Patch updated to drop that change from the diff

Re: linux-next: manual merge of the ttydev tree

[David Brownell]

On Tuesday 01 July 2008, Alan Cox wrote:
> On Tue, 1 Jul 2008 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Today's linux-next merge of the ttydev tree got a conflict in
> > drivers/usb/gadget/serial.c between commit
> > d4013f65e6b7be39e93845c280482e3f1d7894f0 ("usb gadget: use new serial
> > core") from the usb tree and commit
> > e806c01e6c8cacf955620105398902698ec3d933 ("79-tty-break-errorhandler")
> > from the ttydev tree.
> > 
> > The former patch removes the code modified by the latter.  I have used
> > the version from the usb tree.
> 
> Patch updated to drop that change from the diff

A quick search doesn't turn up a ttydev tree, or that patch.

Is that the right long-term fix, so I can consider this resolved?

- Dave

Re: linux-next: manual merge of the ttydev tree

[Alan Cox]

> A quick search doesn't turn up a ttydev tree, or that patch.
> 
> Is that the right long-term fix, so I can consider this resolved?

Consider it resolved - it changed the type of the unneccesary break_ctl
method from void to int. You now don't have one - end of problem 8)

linux-next: manual merge of the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/serial/cpm_uart/cpm_uart_core.c between commit
0b2a2e5b7747f1f63bd86ca22b5c6097da5b2137 ("cpm_uart: Remove
!CONFIG_PPC_CPM_NEW_BINDING code") from the powerpc tree and commit
33e211d606d46d18befa6fe6aec76aa7971eefa8 ("03-serial_vcs") from the
ttydev tree.

The former removes some of the code modified by the latter.  It is a
simple fixup and I can carry it.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]