From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753965AbaBSOf3 (ORCPT ); Wed, 19 Feb 2014 09:35:29 -0500 Received: from mga02.intel.com ([134.134.136.20]:18055 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397AbaBSOf2 convert rfc822-to-8bit (ORCPT ); Wed, 19 Feb 2014 09:35:28 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,505,1389772800"; d="scan'208";a="458097891" From: "Winkler, Tomas" To: Greg KH CC: "arnd@arndb.de" , "linux-kernel@vger.kernel.org" Subject: RE: [char-misc-next 01/11 RESEND] mei: add mei_hbuf_acquire wrapper Thread-Topic: [char-misc-next 01/11 RESEND] mei: add mei_hbuf_acquire wrapper Thread-Index: AQHPK+JGKFcfb1suAUCtzk/7SkOr85q7LkqAgAEoLbCAAC/1gIAAITVw Date: Wed, 19 Feb 2014 14:34:59 +0000 Message-ID: <5B8DA87D05A7694D9FA63FD143655C1B1AF7445C@HASMSX106.ger.corp.intel.com> References: <1392642807-8878-1-git-send-email-tomas.winkler@intel.com> <1392642807-8878-2-git-send-email-tomas.winkler@intel.com> <20140218180357.GA15274@kroah.com> <5B8DA87D05A7694D9FA63FD143655C1B1AF74203@HASMSX106.ger.corp.intel.com> <20140219143539.GB31063@kroah.com> In-Reply-To: <20140219143539.GB31063@kroah.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.184.70.13] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > > 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