linux-kernel - linux-next: manual merge of the wireless-next tree with the pci 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-prev] [day] [month] [year] [list]

Message-ID: <20578.26916.325009.547470@gargle.gargle.HOWL>
Date:	Wed, 26 Sep 2012 08:02:04 +0530
From:	Sujith Manoharan <c_manoha@...lcomm.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	"John W. Linville" <linville@...driver.com>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"Sujith Manoharan" <c_manoha@...lcomm.com>,
	Jiang Liu <jiang.liu@...wei.com>,
	"Bjorn Helgaas" <bhelgaas@...gle.com>
Subject: linux-next: manual merge of the wireless-next tree with the pci
 tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/