linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

2016-04-19 Thread Stephen Rothwell 
Hi Felipe,

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

  drivers/usb/dwc3/debugfs.c

between commit:

  e6bdf8195b4a ("usb: dwc3: fix memory leak of dwc->regset")

from the usb-gadget-fixes tree and commit:

  4e9f311833a9 ("usb: dwc3: make dwc3_debugfs_init return value be void")

from the usb-gadget 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/dwc3/debugfs.c
index cebf9e38b60a,6c14f653dc9b..
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@@ -661,29 -956,16 +956,14 @@@ void dwc3_debugfs_init(struct dwc3 *dwc
IS_ENABLED(CONFIG_USB_DWC3_GADGET)) {
file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root,
dwc, _testmode_fops);
-   if (!file) {
-   ret = -ENOMEM;
-   goto err2;
-   }
- 
-   file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR, 
root,
-   dwc, _link_state_fops);
-   if (!file) {
-   ret = -ENOMEM;
-   goto err2;
-   }
-   }
 -  if (!file)
 -  dev_dbg(dwc->dev, "Can't create debugfs testmode\n");
  
-   return 0;
+   file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR,
+   root, dwc, _link_state_fops);
+   if (!file)
+   dev_dbg(dwc->dev, "Can't create debugfs link_state\n");
  
- err2:
-   kfree(dwc->regset);
- 
- err1:
-   debugfs_remove_recursive(root);
- 
- err0:
-   return ret;
+   dwc3_debugfs_create_endpoint_dirs(dwc, root);
+   }
  }
  
  void dwc3_debugfs_exit(struct dwc3 *dwc)

linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

2016-04-19 Thread Stephen Rothwell 
Hi Felipe,

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

  drivers/usb/dwc3/debugfs.c

between commit:

  e6bdf8195b4a ("usb: dwc3: fix memory leak of dwc->regset")

from the usb-gadget-fixes tree and commit:

  4e9f311833a9 ("usb: dwc3: make dwc3_debugfs_init return value be void")

from the usb-gadget 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/dwc3/debugfs.c
index cebf9e38b60a,6c14f653dc9b..
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@@ -661,29 -956,16 +956,14 @@@ void dwc3_debugfs_init(struct dwc3 *dwc
IS_ENABLED(CONFIG_USB_DWC3_GADGET)) {
file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root,
dwc, _testmode_fops);
-   if (!file) {
-   ret = -ENOMEM;
-   goto err2;
-   }
- 
-   file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR, 
root,
-   dwc, _link_state_fops);
-   if (!file) {
-   ret = -ENOMEM;
-   goto err2;
-   }
-   }
 -  if (!file)
 -  dev_dbg(dwc->dev, "Can't create debugfs testmode\n");
  
-   return 0;
+   file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR,
+   root, dwc, _link_state_fops);
+   if (!file)
+   dev_dbg(dwc->dev, "Can't create debugfs link_state\n");
  
- err2:
-   kfree(dwc->regset);
- 
- err1:
-   debugfs_remove_recursive(root);
- 
- err0:
-   return ret;
+   dwc3_debugfs_create_endpoint_dirs(dwc, root);
+   }
  }
  
  void dwc3_debugfs_exit(struct dwc3 *dwc)

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

2014-11-11 Thread Felipe Balbi 
On Tue, Nov 11, 2014 at 04:23:22PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/dwc3/ep0.c between commit 520fe7633692 ("usb: dwc3: ep0:
> fix for dead code") from the usb-gadget-fixes tree and commit
> ccb072de5702 ("usb: dwc3: ep0: trace ep0 TRBs too") from the usb-gadget
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

resolution looks good to me. Thank you

-- 
balbi


signature.asc
Description: Digital signature

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

2014-11-11 Thread Felipe Balbi 
On Tue, Nov 11, 2014 at 04:23:22PM +1100, Stephen Rothwell wrote:
 Hi Felipe,
 
 Today's linux-next merge of the usb-gadget tree got a conflict in
 drivers/usb/dwc3/ep0.c between commit 520fe7633692 (usb: dwc3: ep0:
 fix for dead code) from the usb-gadget-fixes tree and commit
 ccb072de5702 (usb: dwc3: ep0: trace ep0 TRBs too) from the usb-gadget
 tree.
 
 I fixed it up (see below) and can carry the fix as necessary (no action
 is required).

resolution looks good to me. Thank you

-- 
balbi


signature.asc
Description: Digital signature

linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

2014-11-10 Thread Stephen Rothwell 
Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc3/ep0.c between commit 520fe7633692 ("usb: dwc3: ep0:
fix for dead code") from the usb-gadget-fixes tree and commit
ccb072de5702 ("usb: dwc3: ep0: trace ep0 TRBs too") from the usb-gadget
tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/usb/dwc3/ep0.c
index df38e7ef4976,4c86772126ed..
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@@ -791,10 -793,8 +793,12 @@@ static void dwc3_ep0_complete_data(stru
  
trb = dwc->ep0_trb;
  
+   trace_dwc3_complete_trb(ep0, trb);
+ 
 +  r = next_request(>request_list);
 +  if (!r)
 +  return;
 +
status = DWC3_TRB_SIZE_TRBSTS(trb->size);
if (status == DWC3_TRBSTS_SETUP_PENDING) {
dwc3_trace(trace_dwc3_ep0, "Setup Pending received");


pgpkqOLxkkDVG.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

2014-11-10 Thread Stephen Rothwell 
Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc3/ep0.c between commit 520fe7633692 (usb: dwc3: ep0:
fix for dead code) from the usb-gadget-fixes tree and commit
ccb072de5702 (usb: dwc3: ep0: trace ep0 TRBs too) from the usb-gadget
tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/usb/dwc3/ep0.c
index df38e7ef4976,4c86772126ed..
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@@ -791,10 -793,8 +793,12 @@@ static void dwc3_ep0_complete_data(stru
  
trb = dwc-ep0_trb;
  
+   trace_dwc3_complete_trb(ep0, trb);
+ 
 +  r = next_request(ep0-request_list);
 +  if (!r)
 +  return;
 +
status = DWC3_TRB_SIZE_TRBSTS(trb-size);
if (status == DWC3_TRBSTS_SETUP_PENDING) {
dwc3_trace(trace_dwc3_ep0, Setup Pending received);


pgpkqOLxkkDVG.pgp
Description: OpenPGP digital signature

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

2014-08-22 Thread Felipe Balbi 
On Sat, Aug 23, 2014 at 05:57:23AM +1000, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
> phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from the
> usb-gadget-fixes tree and commit 0dafc3d94596 ("usb: phy: samsung:
> Remove unnecessary lines of register bit definitions") from the
> usb-gadget tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thank you, I'll fix it up the same way once my fixes branch is merged
upstream :-)

-- 
balbi


signature.asc
Description: Digital signature

linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

2014-08-22 Thread Stephen Rothwell 
Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from the
usb-gadget-fixes tree and commit 0dafc3d94596 ("usb: phy: samsung:
Remove unnecessary lines of register bit definitions") from the
usb-gadget tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/usb/phy/phy-samsung-usb.h
index 80eedd45a20a,4eef4971..
--- a/drivers/usb/phy/phy-samsung-usb.h
+++ b/drivers/usb/phy/phy-samsung-usb.h
@@@ -215,8 -185,7 +185,7 @@@
  #define PHYPARAM0_REF_LOSLEVEL(0x9 << 26)
  
  #define EXYNOS5_DRD_PHYPARAM1 (0x20)
- 
 -#define PHYPARAM1_PCS_TXDEEMPH_MASK   (0x1f << 0)
 +#define PHYPARAM1_PCS_TXDEEMPH_MASK   (0x3f << 0)
  #define PHYPARAM1_PCS_TXDEEMPH(0x1c)
  
  #define EXYNOS5_DRD_PHYTERM   (0x24)


signature.asc
Description: PGP signature

linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

2014-08-22 Thread Stephen Rothwell 
Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab (usb:
phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH) from the
usb-gadget-fixes tree and commit 0dafc3d94596 (usb: phy: samsung:
Remove unnecessary lines of register bit definitions) from the
usb-gadget tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/usb/phy/phy-samsung-usb.h
index 80eedd45a20a,4eef4971..
--- a/drivers/usb/phy/phy-samsung-usb.h
+++ b/drivers/usb/phy/phy-samsung-usb.h
@@@ -215,8 -185,7 +185,7 @@@
  #define PHYPARAM0_REF_LOSLEVEL(0x9  26)
  
  #define EXYNOS5_DRD_PHYPARAM1 (0x20)
- 
 -#define PHYPARAM1_PCS_TXDEEMPH_MASK   (0x1f  0)
 +#define PHYPARAM1_PCS_TXDEEMPH_MASK   (0x3f  0)
  #define PHYPARAM1_PCS_TXDEEMPH(0x1c)
  
  #define EXYNOS5_DRD_PHYTERM   (0x24)


signature.asc
Description: PGP signature

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

2014-08-22 Thread Felipe Balbi 
On Sat, Aug 23, 2014 at 05:57:23AM +1000, Stephen Rothwell wrote:
 Hi Felipe,
 
 Today's linux-next merge of the usb-gadget tree got a conflict in
 drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab (usb:
 phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH) from the
 usb-gadget-fixes tree and commit 0dafc3d94596 (usb: phy: samsung:
 Remove unnecessary lines of register bit definitions) from the
 usb-gadget tree.
 
 I fixed it up (see below) and can carry the fix as necessary (no action
 is required).

Thank you, I'll fix it up the same way once my fixes branch is merged
upstream :-)

-- 
balbi


signature.asc
Description: Digital signature