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

Message-Id: <20110720130152.1e2f099c084dbf22e55d2a16@canb.auug.org.au>
Date:	Wed, 20 Jul 2011 13:01:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Benjamin Herrenschmidt <benh@...nel.crashing.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rob Herring <rob.herring@...xeda.com>,
	Arnd Bergmann <arnd@...db.de>
Subject: linux-next: manual merge of the of-pci tree with the arm-soc tree

Hi Benjamin,

Today's linux-next merge of the of-pci tree got a conflict in
arch/microblaze/include/asm/pci-bridge.h between commit f4ffd5e5dfda
("pci: move microblaze and powerpc pci flag functions into asm-generic")
from the arm-soc tree and commit 72bdee79f89f ("microblaze/pci: Remove
powermac originated cruft") from the of-pci tree.

The former removal removed a superset of what the latter removed, so I
used the former.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped