On Thu, Aug 12, 2021 at 12:14:50PM -0500, Bjorn Helgaas wrote:
> On Thu, Aug 12, 2021 at 11:17:12AM -0500, Bjorn Helgaas wrote:
> > [+to Greg, please update sysfs_defferred_iomem_get_mapping-5.15]
>
> Actually, Greg, totally up to you, but if nobody else is depending on
> the sysfs_defferred_iomem_get_mapping-5.15 branch, another possibility
> would be for you to drop that branch and for me to merge the two
> patches on it + Krzysztof's fix below + (hopefully) Krzysztof's PCI
> static attribute work.
I can not "drop" the branch as it is already merged into my
driver-core-next branch that I can not rebase. I could revert it, but
is that really needed?
> That would make my v5.15 pull request easier because I simple-mindedly
> base all my branches on -rc1 while your branch is based on -rc3. But
> again, up to you. I put those two patches on a local branch:
>
> 94b34bc04c25 ("sysfs: Rename struct bin_attribute member to f_mapping")
> 97e9dada53f1 ("sysfs: Invoke iomem_get_mapping() from the sysfs open callback")
>
> in case that seems better to you.
I do not see what I can do with that here as it's already in my tree :(
confused,
greg k-h
