[+cc Ben]
On Tue, Apr 07, 2015 at 11:48:44AM -0500, Bjorn Helgaas wrote:
> On Mon, Apr 6, 2015 at 7:35 PM, David Miller <davem@xxxxxxxxxxxxx> wrote:
> > From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> > Date: Mon, 6 Apr 2015 17:06:38 -0500
> >
> >> But this is a general change that affects all platforms, and it's late in
> >> the cycle for something as invasive as this. I'd rather include your patch
> >> in the v4.1 merge window, and revert d63e2e1f3df9 ("sparc/PCI: Clip bridge
> >> windows to fit in upstream windows") for v4.0.
> >
> > I would kindly ask that we not proceed this way and use the change
> > which implements the fix properly.
>
> I reworked the changelog and pushed this to my for-linus branch for
> v4.0. I'll ask Linus to pull it tomorrow.
>
> https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?h=for-linus&id=1a3ec5e7b00dcd9cac24efe3d65bfccf82597ce5
Based on Ben's concerns, I dropped Yinghai's three patches for now:
PCI: Add pci_bus_addr_t
sparc/PCI: Parse 64-bit host bridge windows from OF
PCI: Allow non-prefetchable PCIe BARs in prefetchable windows
and reverted d63e2e1f3df9 ("sparc/PCI: Clip bridge windows to fit in
upstream windows") instead.
I pushed this to my for-linus branch, which I intend to merge for v4.0.
You can browse it here to see if you agree:
https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=for-linus
Dave, I know you weren't happy with this proposal the first time around,
but I'm not sure why. If you have a better idea, let me know.
Bjorn
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html