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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120521161008.c0cc00b91642ed7a3875a686@canb.auug.org.au>
Date:	Mon, 21 May 2012 16:10:08 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sarah Sharp <sarah.a.sharp@...ux.intel.com>,
	Kalle Valo <kvalo@....qualcomm.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	"John W. Linville" <linville@...driver.com>
Subject: 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@...b.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)

Content of type "application/pgp-signature" skipped