linux-kernel - linux-next: manual merge of the microblaze tree with Linus' 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: <20110726114615.534c5501ac3d27d0459087df@canb.auug.org.au>
Date:	Tue, 26 Jul 2011 11:46:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Michal Simek <michal.simek@...alogix.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>
Subject: linux-next: manual merge of the microblaze tree with Linus' tree

Hi Michal,

Today's linux-next merge of the microblaze tree got a conflict in
arch/microblaze/pci/pci_32.c between commit 98d9f30c820d ("pci/of: Match
PCI devices to OF nodes dynamically") from Linus' tree and commit
c9d761b7c4b6 ("microblaze: PCI fix typo fault in of_node pointer moving
into pci_bus") from the microblaze tree.

The former removed the line fixed up by the latter.  The file was then
removed in a later commit, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped