From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sarah Sharp <sarah.a.sharp@linux.intel.com>,
Kalle Valo <kvalo@qca.qualcomm.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>
Subject: linux-next: manual merge of the usb tree with the net-next tree
Date: Mon, 21 May 2012 16:10:08 +1000 [thread overview]
Message-ID: <20120521161008.c0cc00b91642ed7a3875a686@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1107 bytes --]
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)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-05-21 6:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 6:10 Stephen Rothwell [this message]
2012-05-21 6:16 ` linux-next: manual merge of the usb tree with the net-next tree Kalle Valo
2012-05-21 6:28 ` Stephen Rothwell
2012-05-21 13:08 ` Greg KH
2013-08-13 6:13 Stephen Rothwell
2013-08-13 6:22 ` Greg KH
2019-08-09 5:19 Stephen Rothwell
2019-08-09 8:53 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120521161008.c0cc00b91642ed7a3875a686@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=kvalo@qca.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=sarah.a.sharp@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).