| Message ID | 1455680668-23298-43-git-send-email-gwshan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Benjamin Herrenschmidt |
| Headers | show |
On Tue, Feb 16, 2016 at 9:44 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: > This renames unflatten_dt_node() to unflatten_dt_nodes() as it > populates multiple device nodes from FDT blob. No logical changes > introduced. > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > --- > drivers/of/fdt.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) Acked-by: Rob Herring <robh@kernel.org> I'm happy to take patches 40-42 for 4.6 if the rest of the series doesn't go in given they fix a separate problem. I just need to know soon (or at least they need to go into -next soon). Rob
On Wed, Feb 17, 2016 at 08:59:53AM -0600, Rob Herring wrote: >On Tue, Feb 16, 2016 at 9:44 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >> This renames unflatten_dt_node() to unflatten_dt_nodes() as it >> populates multiple device nodes from FDT blob. No logical changes >> introduced. >> >> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >> --- >> drivers/of/fdt.c | 14 +++++++------- >> 1 file changed, 7 insertions(+), 7 deletions(-) > >Acked-by: Rob Herring <robh@kernel.org> > >I'm happy to take patches 40-42 for 4.6 if the rest of the series >doesn't go in given they fix a separate problem. I just need to know >soon (or at least they need to go into -next soon). > Thanks for quick response, Rob. It depends how much comments I will receive for the powerpc/powernv part. Except that, all parts including this one have been ack'ed. I can discuss it with Michael Ellerman. By the way, how soon you need the decision to merge 40-42? If that's one or two weeks later, I don't think the reivew on the whole series can be done. Also, I think you probably can merge 40-44 as they're all about fdt.c. If they can be merged at one time, I needn't bother (cc) you again if I need send a updated revision. Thanks for your review. Thanks, Gavin >Rob >
On Thu, Feb 18, 2016 at 9:16 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: > On Wed, Feb 17, 2016 at 08:59:53AM -0600, Rob Herring wrote: >>On Tue, Feb 16, 2016 at 9:44 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >>> This renames unflatten_dt_node() to unflatten_dt_nodes() as it >>> populates multiple device nodes from FDT blob. No logical changes >>> introduced. >>> >>> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >>> --- >>> drivers/of/fdt.c | 14 +++++++------- >>> 1 file changed, 7 insertions(+), 7 deletions(-) >> >>Acked-by: Rob Herring <robh@kernel.org> >> >>I'm happy to take patches 40-42 for 4.6 if the rest of the series >>doesn't go in given they fix a separate problem. I just need to know >>soon (or at least they need to go into -next soon). >> > > Thanks for quick response, Rob. It depends how much comments I will > receive for the powerpc/powernv part. Except that, all parts including > this one have been ack'ed. I can discuss it with Michael Ellerman. > By the way, how soon you need the decision to merge 40-42? If that's > one or two weeks later, I don't think the reivew on the whole series > can be done. Well, it's been 2 weeks now. I need to know this week. > Also, I think you probably can merge 40-44 as they're all about > fdt.c. If they can be merged at one time, I needn't bother (cc) > you again if I need send a updated revision. Thanks for your > review. I did not include 43 and 44 as they are only needed for the rest of your series. Rob
On Tue, Mar 01, 2016 at 08:40:12PM -0600, Rob Herring wrote: >On Thu, Feb 18, 2016 at 9:16 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >> On Wed, Feb 17, 2016 at 08:59:53AM -0600, Rob Herring wrote: >>>On Tue, Feb 16, 2016 at 9:44 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >>>> This renames unflatten_dt_node() to unflatten_dt_nodes() as it >>>> populates multiple device nodes from FDT blob. No logical changes >>>> introduced. >>>> >>>> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >>>> --- >>>> drivers/of/fdt.c | 14 +++++++------- >>>> 1 file changed, 7 insertions(+), 7 deletions(-) >>> >>>Acked-by: Rob Herring <robh@kernel.org> >>> >>>I'm happy to take patches 40-42 for 4.6 if the rest of the series >>>doesn't go in given they fix a separate problem. I just need to know >>>soon (or at least they need to go into -next soon). >>> >> >> Thanks for quick response, Rob. It depends how much comments I will >> receive for the powerpc/powernv part. Except that, all parts including >> this one have been ack'ed. I can discuss it with Michael Ellerman. >> By the way, how soon you need the decision to merge 40-42? If that's >> one or two weeks later, I don't think the reivew on the whole series >> can be done. > >Well, it's been 2 weeks now. I need to know this week. > >> Also, I think you probably can merge 40-44 as they're all about >> fdt.c. If they can be merged at one time, I needn't bother (cc) >> you again if I need send a updated revision. Thanks for your >> review. > >I did not include 43 and 44 as they are only needed for the rest of your series. > Rob, sorry for late reponse. I really expect this series to be merged to 4.6 and I was checking reviewers' bandwidth to review it. Unfortunately, I didn't receive any comments except yours until now. That means this series has to miss 4.6. Please pick/merge 41 and 42 if no body has objection. Thanks again for your time on this. Thanks, Gavin
On Mon, Mar 7, 2016 at 6:56 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: > On Tue, Mar 01, 2016 at 08:40:12PM -0600, Rob Herring wrote: >>On Thu, Feb 18, 2016 at 9:16 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >>> On Wed, Feb 17, 2016 at 08:59:53AM -0600, Rob Herring wrote: >>>>On Tue, Feb 16, 2016 at 9:44 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >>>>> This renames unflatten_dt_node() to unflatten_dt_nodes() as it >>>>> populates multiple device nodes from FDT blob. No logical changes >>>>> introduced. >>>>> >>>>> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >>>>> --- >>>>> drivers/of/fdt.c | 14 +++++++------- >>>>> 1 file changed, 7 insertions(+), 7 deletions(-) >>>> >>>>Acked-by: Rob Herring <robh@kernel.org> >>>> >>>>I'm happy to take patches 40-42 for 4.6 if the rest of the series >>>>doesn't go in given they fix a separate problem. I just need to know >>>>soon (or at least they need to go into -next soon). >>>> >>> >>> Thanks for quick response, Rob. It depends how much comments I will >>> receive for the powerpc/powernv part. Except that, all parts including >>> this one have been ack'ed. I can discuss it with Michael Ellerman. >>> By the way, how soon you need the decision to merge 40-42? If that's >>> one or two weeks later, I don't think the reivew on the whole series >>> can be done. >> >>Well, it's been 2 weeks now. I need to know this week. >> >>> Also, I think you probably can merge 40-44 as they're all about >>> fdt.c. If they can be merged at one time, I needn't bother (cc) >>> you again if I need send a updated revision. Thanks for your >>> review. >> >>I did not include 43 and 44 as they are only needed for the rest of your series. >> > > Rob, sorry for late reponse. I really expect this series to be merged to 4.6 and > I was checking reviewers' bandwidth to review it. Unfortunately, I didn't receive > any comments except yours until now. That means this series has to miss 4.6. Please > pick/merge 41 and 42 if no body has objection. Thanks again for your time on this. Too late for 4.6. Rob
On Thu, Mar 17, 2016 at 08:31:16AM -0500, Rob Herring wrote: >On Mon, Mar 7, 2016 at 6:56 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >> On Tue, Mar 01, 2016 at 08:40:12PM -0600, Rob Herring wrote: >>>On Thu, Feb 18, 2016 at 9:16 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >>>> On Wed, Feb 17, 2016 at 08:59:53AM -0600, Rob Herring wrote: >>>>>On Tue, Feb 16, 2016 at 9:44 PM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >>>>>> This renames unflatten_dt_node() to unflatten_dt_nodes() as it >>>>>> populates multiple device nodes from FDT blob. No logical changes >>>>>> introduced. >>>>>> >>>>>> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >>>>>> --- >>>>>> drivers/of/fdt.c | 14 +++++++------- >>>>>> 1 file changed, 7 insertions(+), 7 deletions(-) >>>>> >>>>>Acked-by: Rob Herring <robh@kernel.org> >>>>> >>>>>I'm happy to take patches 40-42 for 4.6 if the rest of the series >>>>>doesn't go in given they fix a separate problem. I just need to know >>>>>soon (or at least they need to go into -next soon). >>>>> >>>> >>>> Thanks for quick response, Rob. It depends how much comments I will >>>> receive for the powerpc/powernv part. Except that, all parts including >>>> this one have been ack'ed. I can discuss it with Michael Ellerman. >>>> By the way, how soon you need the decision to merge 40-42? If that's >>>> one or two weeks later, I don't think the reivew on the whole series >>>> can be done. >>> >>>Well, it's been 2 weeks now. I need to know this week. >>> >>>> Also, I think you probably can merge 40-44 as they're all about >>>> fdt.c. If they can be merged at one time, I needn't bother (cc) >>>> you again if I need send a updated revision. Thanks for your >>>> review. >>> >>>I did not include 43 and 44 as they are only needed for the rest of your series. >>> >> >> Rob, sorry for late reponse. I really expect this series to be merged to 4.6 and >> I was checking reviewers' bandwidth to review it. Unfortunately, I didn't receive >> any comments except yours until now. That means this series has to miss 4.6. Please >> pick/merge 41 and 42 if no body has objection. Thanks again for your time on this. > >Too late for 4.6. > Yeah, Sorry about that, Rob. Thanks, Gavin
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 667a5b2..3fc9a30 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -381,7 +381,7 @@ static void reverse_nodes(struct device_node *parent) } /** - * unflatten_dt_node - Alloc and populate a device_node from the flat tree + * unflatten_dt_nodes - Alloc and populate a device_node from the flat tree * @blob: The parent device tree blob * @mem: Memory chunk to use for allocating device nodes and properties * @dad: Parent struct device_node @@ -389,10 +389,10 @@ static void reverse_nodes(struct device_node *parent) * * It returns the size of unflattened device tree or error code */ -static int unflatten_dt_node(const void *blob, - void *mem, - struct device_node *dad, - struct device_node **nodepp) +static int unflatten_dt_nodes(const void *blob, + void *mem, + struct device_node *dad, + struct device_node **nodepp) { struct device_node *root; int offset = 0, depth = 0; @@ -479,7 +479,7 @@ static void __unflatten_device_tree(const void *blob, } /* First pass, scan for size */ - size = unflatten_dt_node(blob, NULL, NULL, NULL); + size = unflatten_dt_nodes(blob, NULL, NULL, NULL); if (size < 0) return; @@ -495,7 +495,7 @@ static void __unflatten_device_tree(const void *blob, pr_debug(" unflattening %p...\n", mem); /* Second pass, do actual unflattening */ - unflatten_dt_node(blob, mem, NULL, mynodes); + unflatten_dt_nodes(blob, mem, NULL, mynodes); if (be32_to_cpup(mem + size) != 0xdeadbeef) pr_warning("End of tree marker overwritten: %08x\n", be32_to_cpup(mem + size));
This renames unflatten_dt_node() to unflatten_dt_nodes() as it populates multiple device nodes from FDT blob. No logical changes introduced. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- drivers/of/fdt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)