Greg KH wrote: [...] > > I can also provide a patch on top of linux-next instead of > > staging-next-2.6 if you would prefer it in this situation. I will call > > it > > "[PATCH-next 1/3] Staging: batman-adv: Don't increment stats of foreign > > device" > > > > I hope that it doesn't create more confusion as necessary. :) > > I just applied the 3 patches, I shouldn't need to apply the other one on > top of -next, right?
No, it was just in case that some merges happened before you apply them (and
you would get the same situation as it is currently in linux-next).
I hope that the person who must resolve the merge conflict between staging-
next and net-next does the right thing... but I am sure that everything will
work fine (it is relative trivial).
thanks,
Sven
signature.asc
Description: This is a digitally signed message part.
