linux-next: manual merge of the ttydev tree with Linus' 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
7bae0a070db4bc2761dd9515f450cdfa3f3f248c ("USB: Sierra: fix oops upon
device close") from Linus' tree and commit
2db76e5f8b74d5eb0d26a55d4b4e0b2b1c76ff4d ("tty-usb-sierra-updates-pm")
from the ttydev tree.

Just context changes.  I fixed ti up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/serial/sierra.c
index f48d05e,9b22dff..0000000
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@@ -841,7 -884,11 +884,10 @@@ static void sierra_release(struct usb_s
  		portdata = usb_get_serial_port_data(port);
  		if (!portdata)
  			continue;
+ 		portdata->suspend_status = 0;
+ 		device_remove_file(&port->dev, &dev_attr_suspend_status);
+ 
  		kfree(portdata);
 -		usb_set_serial_port_data(port, NULL);
  	}
  }
  
@@@ -864,8 -979,11 +978,11 @@@ static struct usb_serial_driver sierra_
  	.tiocmget          = sierra_tiocmget,
  	.tiocmset          = sierra_tiocmset,
  	.attach            = sierra_startup,
 -	.disconnect        = sierra_disconnect,
 +	.release           = sierra_release,
+ 	.port_probe	   = sierra_create_sysfs_attrs,
  	.read_int_callback = sierra_instat_callback,
+ 	.suspend           = sierra_suspend,
+ 	.resume            = sierra_resume,
  };
  
  /* Functions used by new usb-serial code. */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/