On Fri, Aug 13, 2021 at 09:29:01AM -0500, Bjorn Helgaas wrote: > On Fri, Aug 13, 2021 at 10:19:25AM +0200, Greg Kroah-Hartman wrote: > > 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? > > Nope, I don't think a revert is warranted. I'll take care of getting > Krzysztof's fix into v5.15. Thanks, I'll handle the merge issues after that happens in my tree. greg k-h