linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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.
Date: Tue, 29 Nov 2016 22:32:01 +0100	[thread overview]
Message-ID: <20161129213201.GB22452@kroah.com> (raw)
In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B54333DFB@hasmsx108.ger.corp.intel.com>

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

  reply	other threads:[~2016-11-29 21:31 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-29 12:44 [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Tomas Winkler
2016-11-29 12:44 ` [char-msic 2/3] mei: me: fix place for kaby point device ids Tomas Winkler
2016-11-29 19:15   ` Greg Kroah-Hartman
2016-11-29 20:13     ` Winkler, Tomas
2016-11-29 20:24     ` Winkler, Tomas
2016-11-29 21:32       ` Greg Kroah-Hartman [this message]
2016-11-29 21:43         ` Winkler, Tomas
2016-11-29 12:44 ` [char-msic 3/3] mei: fix return value on disconnection Tomas Winkler
2016-11-29 19:15   ` Greg Kroah-Hartman
2016-11-29 20:15     ` Winkler, Tomas
2016-11-29 20:16     ` Winkler, Tomas
2016-11-29 19:14 ` [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman
2016-11-29 19:21   ` Winkler, Tomas
2016-11-29 21:31     ` Greg Kroah-Hartman
2016-11-29 21:41       ` Winkler, Tomas
2016-11-30  9:24         ` Greg Kroah-Hartman
2016-11-30  9:40           ` Winkler, Tomas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161129213201.GB22452@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=alexander.usyskin@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tomas.winkler@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).