From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Jul 2013 18:40:23 +0000 (-0700)
Subject: Merge tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.11-rc1~158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce49b6289fa3878b190f15192e54bb23dca552b6;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'staging-3.11-rc1' of git://git./linux/kernel/git/gregkh/staging

Pull staging tree update from Greg KH:
 "Here's the large staging tree merge for 3.11-rc1

  Huge thing here is the Lustre client code.  Unfortunatly, due to it
  not building properly on a wide variety of different architectures
  (this was production code???), it is currently disabled from the build
  so as to not annoy people.

  Other than Lustre, there are loads of comedi patches, working to clean
  up that subsystem, iio updates and new drivers, and a load of cleanups
  from the OPW applicants in their quest to get a summer internship.

  All of these have been in the linux-next releases for a while (hence
  the Lustre code being disabled)"

Fixed up trivial conflict in drivers/staging/serqt_usb2/serqt_usb2.c due
to independent renamings in the staging driver cleanup and the USB
tree..

* tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (868 commits)
  Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""
  staging: rtl8192u: fix line length in r819xU_phy.h
  staging: rtl8192u: rename variables in r819xU_phy.h
  staging: rtl8192u: fix comments in r819xU_phy.h
  staging: rtl8192u: fix whitespace in r819xU_phy.h
  staging: rtl8192u: fix newlines in r819xU_phy.c
  staging: comedi: unioxx5: use comedi_alloc_spriv()
  staging: comedi: unioxx5: fix unioxx5_detach()
  silicom: checkpatch: errors caused by macros
  Staging: silicom: remove the board_t typedef in bpctl_mod.c
  Staging: silicom: capitalize labels in the bp_media_type enum
  Staging: silicom: remove bp_media_type enum typedef
  staging: rtl8192u: replace msleep(1) with usleep_range() in r819xU_phy.c
  staging: rtl8192u: rename dwRegRead and rtStatus in r819xU_phy.c
  staging: rtl8192u: replace __FUNCTION__ in r819xU_phy.c
  staging: rtl8192u: limit line size in r819xU_phy.c
  zram: allow request end to coincide with disksize
  staging: drm/imx: use generic irq chip unused field to block out invalid irqs
  staging: drm/imx: use generic irqchip
  staging: drm/imx: ipu-dmfc: use defines for ipu channel numbers
  ...
---

ce49b6289fa3878b190f15192e54bb23dca552b6
diff --cc drivers/staging/serqt_usb2/serqt_usb2.c
index 880f5c0,39de5e0..73fc3cc
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@@ -870,10 -870,10 +870,10 @@@ static int qt_open(struct tty_struct *t
  	usb_clear_halt(serial->dev, port->read_urb->pipe);
  	port0->open_ports++;
  
- 	result = qt_get_device(serial, &port0->DeviceData);
+ 	result = qt_get_device(serial, &port0->device_data);
  
  	/* Port specific setups */
- 	result = qt_open_channel(serial, port->port_number, &ChannelData);
 -	result = qt_open_channel(serial, port->number, &channel_data);
++	result = qt_open_channel(serial, port->port_number, &channel_data);
  	if (result < 0) {
  		dev_dbg(&port->dev, "qt_open_channel failed\n");
  		return result;
@@@ -1239,23 -1245,25 +1239,23 @@@ static void qt_set_termios(struct tty_s
  
  	/* Now determine flow control */
  	if (cflag & CRTSCTS) {
 -		dev_dbg(&port->dev, "%s - Enabling HW flow control port %d\n",
 -			__func__, port->number);
 +		dev_dbg(&port->dev, "%s - Enabling HW flow control\n", __func__);
  
  		/* Enable RTS/CTS flow control */
- 		status = BoxSetHW_FlowCtrl(port->serial, index, 1);
+ 		status = box_set_hw_flow_ctrl(port->serial, index, 1);
  
  		if (status < 0) {
- 			dev_dbg(&port->dev, "BoxSetHW_FlowCtrl failed\n");
+ 			dev_dbg(&port->dev, "box_set_hw_flow_ctrl failed\n");
  			return;
  		}
  	} else {
  		/* Disable RTS/CTS flow control */
  		dev_dbg(&port->dev,
 -			"%s - disabling HW flow control port %d\n",
 -			__func__, port->number);
 +			"%s - disabling HW flow control\n", __func__);
  
- 		status = BoxSetHW_FlowCtrl(port->serial, index, 0);
+ 		status = box_set_hw_flow_ctrl(port->serial, index, 0);
  		if (status < 0) {
- 			dev_dbg(&port->dev, "BoxSetHW_FlowCtrl failed\n");
+ 			dev_dbg(&port->dev, "box_set_hw_flow_ctrl failed\n");
  			return;
  		}
  
@@@ -1324,12 -1332,12 +1324,12 @@@ static inline int qt_real_tiocmget(stru
  	int status;
  	unsigned int index;
  
 -	index = tty->index - serial->minor;
 +	index = port->port_number;
  	status =
- 	    BoxGetRegister(port->serial, index, MODEM_CONTROL_REGISTER, &mcr);
+ 	    box_get_register(port->serial, index, MODEM_CONTROL_REGISTER, &mcr);
  	if (status >= 0) {
  		status =
- 		    BoxGetRegister(port->serial, index,
+ 		    box_get_register(port->serial, index,
  				   MODEM_STATUS_REGISTER, &msr);
  
  	}
@@@ -1363,9 -1371,9 +1363,9 @@@ static inline int qt_real_tiocmset(stru
  	int status;
  	unsigned int index;
  
 -	index = tty->index - serial->minor;
 +	index = port->port_number;
  	status =
- 	    BoxGetRegister(port->serial, index, MODEM_CONTROL_REGISTER, &mcr);
+ 	    box_get_register(port->serial, index, MODEM_CONTROL_REGISTER, &mcr);
  	if (status < 0)
  		return -ESPIPE;