From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52195 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbcGTVs6 (ORCPT ); Wed, 20 Jul 2016 17:48:58 -0400 Date: Wed, 20 Jul 2016 14:49:12 -0700 From: "gregkh@linuxfoundation.org" To: "Marciniszyn, Mike" Cc: "stable@vger.kernel.org" , "Dalessandro, Dennis" , "dledford@redhat.com" Subject: Re: FAILED: patch "[PATCH] IB/hfi1: Fix deadlock with txreq allocation slow path" failed to apply to 4.6-stable tree Message-ID: <20160720214912.GA14708@kroah.com> References: <146827548610821@kroah.com> <32E1700B9017364D9B60AED9960492BC2D05682C@fmsmsx120.amr.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <32E1700B9017364D9B60AED9960492BC2D05682C@fmsmsx120.amr.corp.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Wed, Jul 20, 2016 at 09:17:30PM +0000, Marciniszyn, Mike wrote: > > The patch below does not apply to the 4.6-stable tree. > > If someone wants it applied there, or to any other stable or longterm > > tree, then please email the backport, including the original git commit > > id to . > > > > thanks, > > > > greg k-h > > A 4.6 version is in http://marc.info/?l=linux-rdma&m=146904918032092&w=2. I can't do much with a web-link, can you send me the patch? > Oddly it cherry-picked for me ok. Is this due to a flaw in the stable triggering method in the upstream patch? Hm, if cherry-pick worked, that's a huge hint, can you send me the cherry-picked patch output? Odds are git can handle a merge issue better than quilt can. thanks, greg k-h