On Thu, May 24, 2018 at 09:24:27AM +0200, Marek Vasut wrote: > On 05/23/2018 11:56 PM, Bjorn Helgaas wrote: > > On Wed, May 23, 2018 at 07:05:06PM +0200, Marek Vasut wrote: > >> On 05/23/2018 06:17 PM, Lorenzo Pieralisi wrote: > >>> On Mon, May 21, 2018 at 03:11:20PM +0200, Marek Vasut wrote: > >>>> The function name is just too confusing, rename it, no functional change. > >>>> Rename the function to rcar_pcie_alloc_and_parse_pci_resource_list() as > >>>> it's matching failpath function is pci_free_resource_list() so the names > >>>> align much better and the new name also describes what the function does > >>>> much better. > >>>> > >>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@xxxxxxxxx> > >>>> Cc: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> > >>>> Cc: Phil Edworthy <phil.edworthy@xxxxxxxxxxx> > >>>> Cc: Simon Horman <horms+renesas@xxxxxxxxxxxx> > >>>> Cc: Wolfram Sang <wsa@xxxxxxxxxxxxx> > >>>> Cc: linux-renesas-soc@xxxxxxxxxxxxxxx > >>>> --- > >>>> drivers/pci/host/pcie-rcar.c | 4 ++-- > >>>> 1 file changed, 2 insertions(+), 2 deletions(-) > >>> > >>> Can you rebase this series against my pci/rcar branch please ? > >>> > >>> I will merge it then, thanks. > >> > >> Where is that tree/branch located ? > >> > >> It applies fine on current next 20180517, is there a problem ? > > https://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/log/?h=pci/rcar > > OK, 1/4 is dropped, the remaining patches are resubmitted. I added one > more (6/6) since the phy patches in that tree added a bug into the fail > path, so I fixed that too. Please CC me if you want me to merge your code, I monitor linux-pci but that would help me, thanks. You did not add the review tags you received to the new series (also a cover letter - however minimal - and a version number would help), please add them and post a v2 so that I can merge them, I can do that for you but it is good practice for the future. Thanks, Lorenzo > > I don't think next 20180517 includes Lorenzo's pci/rcar branch, so > > there might be conflicts. I think Stephen is on vacation until next > > week, so there isn't a newer -next tree yet. > > OK > > -- > Best regards, > Marek Vasut
