Hi Stephen,
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/pci/pci-sysfs.c
>
> between commit:
>
> 045a9277b561 ("PCI/sysfs: Use correct variable for the legacy_mem sysfs object")
>
> from the pci-current tree and commits:
>
> 93bb8e352a91 ("sysfs: Invoke iomem_get_mapping() from the sysfs open callback")
> f06aff924f97 ("sysfs: Rename struct bin_attribute member to f_mapping")
>
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thank you for fixing this!
We did crossed the streams there a little bit, so to speak. Sincere
apologies.
Krzysztof
