On Tue, Aug 6, 2013 at 4:39 AM, Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx> wrote: > Dear Bjorn Helgaas, > > [+cc Jason Cooper, Gregory Clement and Ezequiel Garcia] > > On Tue, 23 Jul 2013 12:38:28 -0600, Bjorn Helgaas wrote: >> [+cc Thomas] >> >> On Mon, Jun 17, 2013 at 3:16 AM, Tushar Behera <tushar.behera@xxxxxxxxxx> wrote: >> > Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") >> > introduced devm_ioremap_resource() and deprecated the use of >> > devm_request_and_ioremap(). >> > >> > While at it, modify mvebu_pcie_map_registers() to propagate error code. >> > >> > Signed-off-by: Tushar Behera <tushar.behera@xxxxxxxxxx> >> > CC: linux-pci@xxxxxxxxxxxxxxx >> > CC: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> >> >> Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> >> >> Thomas has a bunch of mvebu patches in the pipeline, so I assume he >> will incorporate this if appropriate. I don't want to put it in my >> tree and cause conflicts with his changes. Let me know if I should do >> something else here. > > I don't really have that many pci-mvebu.c patches in the pipeline > actually. The only one I have is to enable MSI support, and it's a > fairly light one that should not conflict too badly with this one. > > Therefore, Bjorn, I believe this patch could go through your tree, > either for 3.11 or 3.12 as you prefer. Added to pci/misc for v3.12. Thanks. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html