linux-kernel - linux-next: manual merge of the pci tree with the mips 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: <20120227113129.c03c34ff7ea516f155cf0c87@canb.auug.org.au>
Date:	Mon, 27 Feb 2012 11:31:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jesse Barnes <jbarnes@...tuousgeek.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Ralf Baechle <ralf@...ux-mips.org>
Subject: linux-next: manual merge of the pci tree with the mips tree

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
arch/mips/pci/pci.c between commit f79eaeb10849 ("MIPS: PCI: use
list_for_each_entry() for bus->devices traversal") from the mips tree and
commit 96a6b9ad05a2 ("mips/PCI: get rid of device resource fixups") from
the pci tree.

The latter appears to supersede the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped