On Thu, 23 Feb 2012 21:04:04 -0800 Bjorn Helgaas <bhelgaas@xxxxxxxxxx> wrote: > Hi Jesse, > > I rebased these series: > > v2 generic pci_probe_only flag > (http://marc.info/?l=linux-pci&m=133002621016744&w=2) > > v2 add PCI bus-to-resource offset support in core > (http://marc.info/?l=linux-pci&m=132884138928641&w=2) > > onto your current linux-next tree (based on commit 823806ff). Minor > conflict resolutions in include/linux/pci.h, and that's about it. > > You can examine the result here: > > https://github.com/bjorn-helgaas/linux/tree/pci-next+probe_only+bus2res-fb127cb > > or pull both series with: > > git pull git://github.com/bjorn-helgaas/linux.git > pci-next+probe_only+bus2res-fb127cb Nice, I like all the deletions especially. Pulled into linux-next. -- Jesse Barnes, Intel Open Source Technology Center
Attachment:
signature.asc
Description: PGP signature
