linux-next: manual merge of the usb tree with the usb.current tree

[Stephen Rothwell]

Hi all,

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

  drivers/usb/cdns3/ep0.c

between commit:

  c0e2a0341cd8 ("usb: cdns3: ep0: fix the test mode set incorrectly")

from the usb.current tree and commit:

  62fb45d317c5 ("USB: ch9: add "USB_" prefix in front of TEST defines")

from the usb 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/usb/cdns3/ep0.c
index 61ec5bb2b0ca,04a522f5ae58..000000000000
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@@ -327,12 -327,11 +327,12 @@@ static int cdns3_ep0_feature_handle_dev
  		if (!set || (tmode & 0xff) != 0)
  			return -EINVAL;
  
 -		switch (tmode >> 8) {
 +		tmode >>= 8;
 +		switch (tmode) {
- 		case TEST_J:
- 		case TEST_K:
- 		case TEST_SE0_NAK:
- 		case TEST_PACKET:
+ 		case USB_TEST_J:
+ 		case USB_TEST_K:
+ 		case USB_TEST_SE0_NAK:
+ 		case USB_TEST_PACKET:
  			cdns3_set_register_bit(&priv_dev->regs->usb_cmd,
  					       USB_CMD_STMODE |
  					       USB_STS_TMODE_SEL(tmode - 1));

Attachment: pgpZbsyXPhHY8.pgp
Description: OpenPGP digital signature