On Fri, 06 Nov 2020 21:58:12 +0530 Manivannan Sadhasivam wrote: >>> Since you've applied now, what would you propose? >> >> Do you need mhi_queue_is_full() in other branches, or are you just >> concerned about the conflicts? > > Yes, I need this patch in mhi-next. > >> I'm assuming the concern is just about the mhi/core patch, or would >> you need to refactor something in the net driver as well? > > Just the mhi_queue_is_full() patch. Okay, I think you can just apply that patch to your tree again and git should figure out it's a duplicate. Not optimal, because the change will have two hashes, but the function is trivial, shouldn't be an issue even if conflict happens. Will you need it in wireless (ath11k), or only in other trees? If it ends up in the wireless tree Dave or I will do the resolution when we pull from Kalle so it won't even appear to Linus (but then it should go into wireless through an immutable branch).
