From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753542AbcK2Vb6 (ORCPT <rfc822;w@1wt.eu>);
        Tue, 29 Nov 2016 16:31:58 -0500
Received: from mail.linuxfoundation.org ([140.211.169.12]:42256 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751438AbcK2Vbw (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 29 Nov 2016 16:31:52 -0500
Date: Tue, 29 Nov 2016 22:32:01 +0100
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: "Winkler, Tomas" <tomas.winkler@intel.com>
Cc: "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "Usyskin, Alexander" <alexander.usyskin@intel.com>
Subject: Re: [char-msic 2/3] mei: me: fix place for kaby point device ids.
Message-ID: <20161129213201.GB22452@kroah.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>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B54333DFB@hasmsx108.ger.corp.intel.com>
User-Agent: Mutt/1.7.1 (2016-10-04)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
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: <stable@vger.kernel.org> #4.4
> > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > > ---
> > > >  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?

thanks,

greg k-h