On Mon, Sep 10, 2018 at 06:36:52PM -0700, Atish Patra wrote: > On 9/10/18 4:26 AM, Christoph Hellwig wrote: > > On Thu, Sep 06, 2018 at 01:05:29AM -0700, Atish Patra wrote: > > > From: Palmer Dabbelt <pal...@sifive.com> > > > > > > It's a bit confusing exactly what this function does: it actually > > > returns the hartid of an OF processor node, failing with -1 on invalid > > > nodes. I've changed the name to _hartid() in order to make that a bit > > > more clear, as well as adding a comment. > > > > > > Signed-off-by: Palmer Dabbelt <pal...@sifive.com> > > > > Looks generally good, but it is going to conflict with the dt iterators > > series from Rob. Given that this is just a little cleanup it might be > > worth deferring until the next merge window. > > > > Sure. np. I guess the entire series can be parked in for-next until the next > merge window opens.
Actually more in your series also conflicts. I think we can defer the patch from Rob as it is very small and simple and can be applied post 4.20-rc1.
