Hi Marcel, thank you for your help. On Tue, Sep 23, 2014 at 06:19:59PM +0200, Marcel Holtmann wrote: > Hi Alex, > > >>>>> I/Simon mainly add you here in cc because this bug what Simon fixed here > >>>>> is also inside of bluetooth 6lowpan. > >>>> > >>>> BTW, the v4 patch does not apply cleanly to bluetooth-next. The > >>>> modifications were very small thou. > >>>> > >>> > >>> It's a bug fix and should be go to wpan, then wpan goes to bluetooth. I > >>> know there is some easy solveable merge conflict... but maintainers need to be > >>> deal with it then. ;-) > >>> > >>> When this is an easy conflict it doesn't matter to wait on it. I hope > >>> that's okay for all maintainers, I am new in this handling. Maintainers > >>> isn't just "apply patches", making the right workflow and solve merge > >>> conflicts, I think. Otherwise some maintainer will tell me "don't making merge > >>> conflicts!", but I heard nothing something like that now. > >>> > >>> Or we wait when these changes are in bluetooth repo, which means also > >>> wpan repo. > >> > >> since 3.17 is basically around the corner, adding it to bluetooth tree is not getting us anywhere right now. So what I would do is include it in bluetooth-next and add a CC: stable tag to it. > >> > > > > you are right. I will try that to CC: stable on this patch. Please don't > > be angry that I will fail there. The last time when I tried it I got a > > formletter back. :-) > > check if the patch would actually apply against 3.16.x and if it does just included CC: stable@xxxxxxxxxxxxxxx under the signed-off-by line. If it doesn't, then we need to get the fix included first. And after the merge window we reference it by a version that applies to 3.16.x and send it to stable tree manually. However in all cases patch needs to hit Linus' tree first. > doesn't apply against "3.16.x". I will apply it to my wpan-next testing branch and in the next days I will send it to your bluetooth-next with a couple of other patches. My understanding is that we are close of releasing 3.17 it makes no sense to send it to bluetooth now. When the patch hit's "linus" tree we can make a different patch for 3.16.x and send it to -stable. - Alex -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
