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
| ||
|
Date: Mon, 20 Dec 2010 13:08:12 +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 <bjorn.helgaas@...com>
Subject: linux-next: manual merge of the pci tree with Linus' tree
Hi Jesse,
Today's linux-next merge of the pci tree got a conflicts in
arch/x86/kernel/resource.c arch/x86/pci/i386.c kernel/resource.c between
various commits from Linus' tree and similar commits from the pci tree.
I just used the versions from Linus' tree and assume that the pci tree
needs to be resynced.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists