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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/net/wireless/ath/ath6kl/usb.c between commit 9cbee358687e
("ath6kl: add full USB support") from the net-next tree and commit
e1f12eb6ba6f ("USB: Disable hub-initiated LPM for comms devices") from
the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/ath/ath6kl/usb.c
index dfbbe9e,f8a27db..0000000

--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c

@@@ -1185,12 -403,9 +1185,13 @@@ MODULE_DEVICE_TABLE(usb, ath6kl_usb_ids
  static struct usb_driver ath6kl_usb_driver = {
  	.name = "ath6kl_usb",
  	.probe = ath6kl_usb_probe,
 +	.suspend = ath6kl_usb_suspend,
 +	.resume = ath6kl_usb_resume,
 +	.reset_resume = ath6kl_usb_reset_resume,
  	.disconnect = ath6kl_usb_remove,
  	.id_table = ath6kl_usb_ids,
 +	.supports_autosuspend = true,
+ 	.disable_hub_initiated_lpm = 1,
  };
  
  static int ath6kl_usb_init(void)

On 05/21/2012 09:10 AM, Stephen Rothwell wrote:

Today's linux-next merge of the usb tree got a conflict in
drivers/net/wireless/ath/ath6kl/usb.c between commit 9cbee358687e
("ath6kl: add full USB support") from the net-next tree and commit
e1f12eb6ba6f ("USB: Disable hub-initiated LPM for comms devices") from
the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

Is there anything I should do in ath6kl to handle the issue?

Kalle

Hi Kalle,

On Mon, 21 May 2012 09:16:57 +0300 Kalle Valo [off-list ref] wrote:

Is there anything I should do in ath6kl to handle the issue?

No, Linus will take care of it when he merges the two trees.

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

On Mon, May 21, 2012 at 04:10:08PM +1000, Stephen Rothwell wrote:

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/net/wireless/ath/ath6kl/usb.c between commit 9cbee358687e
("ath6kl: add full USB support") from the net-next tree and commit
e1f12eb6ba6f ("USB: Disable hub-initiated LPM for comms devices") from
the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

Looks good to me, thanks.

greg k-h