From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sarah Sharp <sarah.a.sharp@linux.intel.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the usb tree with the net-next tree
Date: Mon, 21 May 2012 09:16:57 +0300 [thread overview]
Message-ID: <4FB9DDD9.8000506@qca.qualcomm.com> (raw)
In-Reply-To: <20120521161008.c0cc00b91642ed7a3875a686@canb.auug.org.au>
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
WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Sarah Sharp <sarah.a.sharp@linux.intel.com>,
David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the usb tree with the net-next tree
Date: Mon, 21 May 2012 09:16:57 +0300 [thread overview]
Message-ID: <4FB9DDD9.8000506@qca.qualcomm.com> (raw)
In-Reply-To: <20120521161008.c0cc00b91642ed7a3875a686@canb.auug.org.au>
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
next prev parent reply other threads:[~2012-05-21 6:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 6:10 linux-next: manual merge of the usb tree with the net-next tree Stephen Rothwell
2012-05-21 6:10 ` Stephen Rothwell
2012-05-21 6:16 ` Kalle Valo [this message]
2012-05-21 6:16 ` Kalle Valo
2012-05-21 6:28 ` Stephen Rothwell
2012-05-21 6:28 ` Stephen Rothwell
2012-05-21 13:08 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
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=4FB9DDD9.8000506@qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=davem@davemloft.net \
--cc=greg@kroah.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 \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.