linux-kernel - Re: [char-misc-next 01/11 RESEND] mei: add mei_hbuf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 19 Feb 2014 06:35:39 -0800
From:	Greg KH <gregkh@...uxfoundation.org>
To:	"Winkler, Tomas" <tomas.winkler@...el.com>
Cc:	"arnd@...db.de" <arnd@...db.de>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [char-misc-next 01/11 RESEND] mei: add mei_hbuf_acquire wrapper

On Wed, Feb 19, 2014 at 09:58:08AM +0000, Winkler, Tomas wrote:
> 
> > 
> > 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.

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?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/