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] [day] [month] [year] [list]
Date:	Wed, 19 Feb 2014 14:34:59 +0000
From:	"Winkler, Tomas" <tomas.winkler@...el.com>
To:	Greg KH <gregkh@...uxfoundation.org>
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


> > 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

--
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/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ