Messages in this thread | | | From | "Winkler, Tomas" <> | Subject | RE: [char-misc-next 01/11 RESEND] mei: add mei_hbuf_acquire wrapper | Date | Wed, 19 Feb 2014 14:34:59 +0000 |
| |
> > The patch 'mei: set client's read_cb to NULL when flow control fails' > > (accb884b32e82f943340688c9cd30290531e73e0) Which is in > > char-misc-linus, still haven't make it to the upstream...I thought it > > would be in rc3 already. > > No, you sent it too late for that. > > > I can either fix the current series and then you will need to resolve > > quite simple conflict in merge (it's just a two line patch) or we wait > > for another cycle. I would prefer the first option as I have few more > > patches in the queue I won't to send for review but it's up to you. > > I'll merge char-misc-linus into char-misc-next and then can you resend > the pending patches to me?
Works for me. Tomas
| |