From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756738AbcK2Vnd convert rfc822-to-8bit (ORCPT ); Tue, 29 Nov 2016 16:43:33 -0500 Received: from mga14.intel.com ([192.55.52.115]:25094 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753150AbcK2VnZ (ORCPT ); Tue, 29 Nov 2016 16:43:25 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,570,1473145200"; d="scan'208";a="906912857" From: "Winkler, Tomas" To: Greg Kroah-Hartman CC: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Usyskin, Alexander" Subject: RE: [char-msic 2/3] mei: me: fix place for kaby point device ids. Thread-Topic: [char-msic 2/3] mei: me: fix place for kaby point device ids. Thread-Index: AQHSSnTjm3GYwR53pky2+r2DezqleKDwZNAQgAAC5VD///HkgIAAJE1w Date: Tue, 29 Nov 2016 21:43:19 +0000 Message-ID: <5B8DA87D05A7694D9FA63FD143655C1B54333E7D@hasmsx108.ger.corp.intel.com> References: <1480423486-32307-1-git-send-email-tomas.winkler@intel.com> <1480423486-32307-2-git-send-email-tomas.winkler@intel.com> <20161129191507.GB29438@kroah.com> <5B8DA87D05A7694D9FA63FD143655C1B54333DFB@hasmsx108.ger.corp.intel.com> <20161129213201.GB22452@kroah.com> In-Reply-To: <20161129213201.GB22452@kroah.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTc0ZjhjMzktMWJmMi00YTUwLTk5YjQtM2M3YTYxY2RmMzExIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6Ijc1UGxINFNaWjdJYmpWdWV0ajdWN0RBMzdGbGFHRmhRdThKc3ZZNCtkekE9In0= x-originating-ip: [10.184.70.11] 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 > > On Tue, Nov 29, 2016 at 08:24:08PM +0000, Winkler, Tomas wrote: > > > > > > > > On Tue, Nov 29, 2016 at 02:44:45PM +0200, Tomas Winkler wrote: > > > > > This is fix of the backported patch only, it places KBL DIDs on > > > > > correct place to easy on backporting of further DIDs. > > > > > > > > > > Fixes: 5c99f32c461c ('mei: me: add kaby point device ids') > > > > > Cc: #4.4 > > > > > Signed-off-by: Tomas Winkler > > > > > --- > > > > > drivers/misc/mei/hw-me-regs.h | 7 ++++--- > > > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > > > > > What did I mess up? > > > > The KBL DIDs were moved to a different part of the file during back > > port, than in the original patch hence the consequent patches will not apply > cleanly. > > What patch caused the ids to be moved around? The one previous to this in > this series, or some other patch that is already in the tree? This patch "Fixes: 5c99f32c461c ('mei: me: add kaby point device ids')" Which is already in the tree. Thanks Tomas