From: Sujith Manoharan <c_manoha@qualcomm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver.com>,
<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Sujith Manoharan" <c_manoha@qualcomm.com>,
Jiang Liu <jiang.liu@huawei.com>,
"Bjorn Helgaas" <bhelgaas@google.com>
Subject: linux-next: manual merge of the wireless-next tree with the pci tree
Date: Wed, 26 Sep 2012 08:02:04 +0530 [thread overview]
Message-ID: <20578.26916.325009.547470@gargle.gargle.HOWL> (raw)
In-Reply-To: <20120926120317.63d0b4acb0502bc4c2ffe4b8@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/ath/ath9k/pci.c between commit 08bd108096b6 ("ath9k:
> Use PCI Express Capability accessors") from the pci tree and commit
> 046b6802c8d3 ("ath9k: Disable ASPM only for AR9285") from the
> wireless-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The fix looks good, thanks.
Sujith
prev parent reply other threads:[~2012-09-26 2:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-26 2:03 Stephen Rothwell
2012-09-26 2:32 ` Sujith Manoharan [this message]
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=20578.26916.325009.547470@gargle.gargle.HOWL \
--to=c_manoha@qualcomm.com \
--cc=bhelgaas@google.com \
--cc=jiang.liu@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®