Re: New conflict message in latest GIT

[Fabio Comolli]

Hi Rene.
I can only confirm that Linus' tree  2.6.26-06077-gc010b2f
(commit c010b2f... Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6)
shows the message.

Grepping the file you suggested gives:

fcomolli@hawking:~/software/GIT-TREES/linux-2.6/drivers/pnp> egrep
'RESOURCE_IO|RESOURCE_MEM' quirks.c
		    option->type == IORESOURCE_IO) {
			if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM) ||
			     (res = pnp_get_resource(dev, IORESOURCE_MEM, j));
fcomolli@hawking:~/software/GIT-TREES/linux-2.6/drivers/pnp>

so both IORESOURCE_IO and IORESOURCE_MEM are present in the file...

But definitely this is Linus' tree.
Cheers,
Fabio

On Wed, Jul 23, 2008 at 10:01 AM, Rene Herman <rene.herman@xxxxxxxxxxxx> wrote:
> On 23-07-08 09:17, Fabio Comolli wrote:
>
>>>
>>> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.26-rc8/2.6.26-rc8-mm1/broken-out/pnp-have-quirk_system_pci_resources-include-io-resources.patch
>>
>> I did not add it manually for sure. By the way, I don't see any ACPI
>> related problems with this kernel.
>
> You can just look at drivers/pnp/quirks.c:quirk_system_pci_resources() and
> see if it's still IORESOURCE_MEM only (current linus) or includes
> IORESOURCE_IO resources as per that patch.
>
> Had a momentary notion that if we specifically exclude ACPI in favour of PCI
> as that patch does this could _cause_ the message -- before, the PCI smbus
> driver just would've failed but perhaps you don't even have such a driver or
> something.
>
> Probably way of base. Just had a deja vu to my own soundcard trouble.
>
> Rene
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/