From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752263AbcEKSLO (ORCPT ); Wed, 11 May 2016 14:11:14 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:42786 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751676AbcEKSLM (ORCPT ); Wed, 11 May 2016 14:11:12 -0400 Subject: Re: 4.1.24-stable: iwlwifi patch applied to wrong file To: Jens Rottmann , stable@vger.kernel.org References: <573371EC.3060302@ADLINKtech.com> Cc: Emmanuel Grumbach , linux-kernel@vger.kernel.org From: Sasha Levin Message-ID: <573375B5.8010002@oracle.com> Date: Wed, 11 May 2016 14:11:01 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <573371EC.3060302@ADLINKtech.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/11/2016 01:54 PM, Jens Rottmann wrote: > Hi again, > > in 4.1.24-stable commit fdfdfc7cdf (iwlwifi: pcie: lower the debug level > for RSA semaphore access) was applied to the wrong file. It patched > drivers/net/wireless/intel/iwlwifi/pcie/trans.c whereas it should have > patched drivers/net/wireless/iwlwifi/pcie/trans.c instead. > > drivers/net/wireless/intel/iwlwifi/pcie/trans.c is a useless artifact > created by a faulty patch, which went into 4.1.18 (d9d42b679e36 iwlwifi: > pcie: properly configure the debug buffer size for 8000) I already > reported this a while ago ("4.1.18 introduced spurious copy of renamed > iwlwifi trans.c"). > > For 4.1.25 please delete drivers/net/wireless/intel/iwlwifi/pcie/trans.c > and reapply the "lower the debug level" patch to the correct file. Oh I thought that I removed that file after the previous mail about it :/ Fixed in queue now, and I'll make sure it's right before shipping .25 Thanks, Sasha