Re: [pci:pci/gavin-window-alignment 5/5] arch/powerpc/platforms/powernv/pci-ioda.c:1164:3: error: implicit declaration of function 'pci_pcie_type'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, 2012-09-13 at 08:49 -0600, Bjorn Helgaas wrote:
> I merged v3.6-rc5 into my "next" branch, fixed the conflicts in
> 
>         drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
>         drivers/rapidio/devices/tsi721.c
> 
> and pushed the result.  Let me know if this is not what you expected.

Thanks. I'll end up pulling your entire next branch then. Unless you can
do the same exercise in the topic branch I'm interested in :-)

Cheers,
Ben.


--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux