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 09:58:08 +0000 |
| |
> > This patch fails to apply to my char-misc-next branch (I've pulled in > 3.14-rc3 into this branch now): > checking file drivers/misc/mei/amthif.c > checking file drivers/misc/mei/client.c > Hunk #4 FAILED at 681. > Hunk #5 succeeded at 815 (offset -2 lines). > Hunk #6 succeeded at 848 (offset -2 lines). > 1 out of 6 hunks FAILED > checking file drivers/misc/mei/hw-me.c > checking file drivers/misc/mei/hw-txe.c > checking file drivers/misc/mei/interrupt.c > checking file drivers/misc/mei/mei_dev.h > checking file drivers/misc/mei/wd.c > > Care to fix this up and resend this series?
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.
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.
Thanks Tomas
| |