linux-next: manual merge of the staging tree with the usb tree

linux-next: manual merge of the staging tree with the usb tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/quatech_usb2/quatech_usb2.c between commit 38902cf9f6be
("USB: remove staging quatech_usb2 driver") from the usb tree and a
couple of commits from the staging tree.

The former removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: manual merge of the staging tree with the usb tree

[Greg KH]

On Fri, May 11, 2012 at 03:12:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/quatech_usb2/quatech_usb2.c between commit 38902cf9f6be
> ("USB: remove staging quatech_usb2 driver") from the usb tree and a
> couple of commits from the staging tree.
> 
> The former removes the file, so I did that.

Wonderful, thanks for doing that.

greg k-h

Re: linux-next: manual merge of the staging tree with the usb tree

[Greg KH]

On Mon, May 01, 2017 at 02:09:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/Makefile
> 
> between commit:
> 
>   f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
> 
> from the usb tree and commit:
> 
>   051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
>   abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")
> 
> from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I'm the maintainer of both :)

Anyway, I knew this was going to happen, I'll take your fix when the
merge happens, thanks.

greg k-h

linux-next: manual merge of the staging tree with the usb tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/Makefile

between commit:

  f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")

from the usb tree and commit:

  051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
  abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/Makefile
index 682127c20da5,422fae4ea0f3..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -41,4 -42,5 +43,4 @@@ obj-$(CONFIG_MOST)		+= most
  obj-$(CONFIG_KS7010)		+= ks7010/
  obj-$(CONFIG_GREYBUS)		+= greybus/
  obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
- obj-$(CONFIG_SND_BCM2835)	+= bcm2835-audio/
+ obj-$(CONFIG_CRYPTO_DEV_CCREE)	+= ccree/
 -

Re: linux-next: manual merge of the staging tree with the usb tree

[Greg KH]

On Tue, Jun 18, 2013 at 02:55:59PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
> ("USB: serial: ports: add minor and port number") from the usb tree and
> commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style
> CamelCases") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix looks fine, thanks.

greg k-h

linux-next: manual merge of the staging tree with the usb tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
("USB: serial: ports: add minor and port number") from the usb tree and
commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style
CamelCases") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/serqt_usb2/serqt_usb2.c
index 880f5c0,39de5e0..0000000
--- 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;
  

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

Re: linux-next: manual merge of the staging tree with the usb tree

[Greg KH]

On Wed, Sep 19, 2012 at 02:35:05PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/serqt_usb2/serqt_usb2.c between commit e8656b02ef35
> ("USB: serial: serqt_usb2: remove dbg() usage") from the usb tree and
> commit 623c2bb2c59a ("staging: serqt_usb2: fix dbg print when kzalloc
> failed to allocate qt_port") from the staging tree.
> 
> The former removes the line changed by the latter, so I just did that (no
> action is required).

That looks correct, thanks for doing this.

greg k-h

linux-next: manual merge of the staging tree with the usb tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/serqt_usb2/serqt_usb2.c between commit e8656b02ef35
("USB: serial: serqt_usb2: remove dbg() usage") from the usb tree and
commit 623c2bb2c59a ("staging: serqt_usb2: fix dbg print when kzalloc
failed to allocate qt_port") from the staging tree.

The former removes the line changed by the latter, so I just did that (no
action is required).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: manual merge of the staging tree with the usb tree

[Greg KH]

On Tue, Apr 24, 2012 at 02:48:20PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB:
> driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb
> ("Staging: line6: only allocate a buffer if it is needed") (and later)
> from the staging tree.
> 
> The latter supercedes the former, so I used that.

Thanks, that is correct.

greg k-h

linux-next: manual merge of the staging tree with the usb tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB:
driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb
("Staging: line6: only allocate a buffer if it is needed") (and later)
from the staging tree.

The latter supercedes the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: manual merge of the staging tree with the usb tree

[Greg KH]

On Mon, Apr 23, 2012 at 03:11:46PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3
> ("USB: dt9812.c: remove err() usage") from the usb tree and commit
> 73e2918990c0 ("staging: Fix typo in multiple files") from the staging
> tree.
> 
> The former supercedes the latter, so I used that.

Thanks, that sounds correct.

greg k-h

linux-next: manual merge of the staging tree with the usb tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3
("USB: dt9812.c: remove err() usage") from the usb tree and commit
73e2918990c0 ("staging: Fix typo in multiple files") from the staging
tree.

The former supercedes the latter, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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