From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail-by2on0065.outbound.protection.outlook.com ([207.46.100.65]:10512
	"EHLO na01-by2-obe.outbound.protection.outlook.com"
	rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
	id S1754333AbcDYRlj (ORCPT <rfc822;stable@vger.kernel.org>);
	Mon, 25 Apr 2016 13:41:39 -0400
To: Sasha Levin <sasha.levin@oracle.com>
CC: Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
	<stable@vger.kernel.org>
From: Jens Rottmann <Jens.Rottmann@ADLINKtech.com>
Subject: 4.1.18 introduced spurious copy of renamed iwlwifi trans.c
Message-ID: <571E56BE.3030406@ADLINKtech.com>
Date: Mon, 25 Apr 2016 19:41:18 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

Hi,

some time after 4.1
drivers/net/wireless/iwlwifi/pcie/trans.c
got moved to
drivers/net/wireless/intel/iwlwifi/pcie/trans.c

Later upstream commit 62d7476d958ce06d7a10b02bdb30006870286fe2
"iwlwifi: pcie: properly configure the debug buffer size for 8000"
fixed something in the new intel/iwlwifi/pcie/trans.c

The patch was backported and included in 4.1.18 as commit
d9d42b679e3653759b107ff99daf8da9c21aaec7. It does nicely apply to the
old file iwlwifi/pcie/trans.c, _however_ by mistake the patch also
introduces a useless copy of the complete file at it's modern home
intel/iwlwifi/pcie/trans.c

The 'fix' would be to delete the surplus file again. I don't know if you
want this, the 2nd copy of trans.c is never compiled, so strictly
speaking it does no harm - except that it confused me enough to write
this mail. :-)

Regards,
Jens