From: Andreas Noever Date: Thu, 23 Jan 2014 20:59:24 +0000 (+0100) Subject: PCI: Use request_resource_conflict() instead of insert_ for bus numbers X-Git-Tag: v3.15-rc1~143^2~11^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ced04d15519a15d38b46162b94a1f26b4022116e;p=pandora-kernel.git PCI: Use request_resource_conflict() instead of insert_ for bus numbers If a conflict happens during insert_resource_conflict() and all conflicts fit within the newly inserted resource then they will become children of the new resource. This is almost certainly not what we want for bus numbers. Signed-off-by: Andreas Noever Signed-off-by: Bjorn Helgaas --- Reading git-diff-tree failed