> > 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@xxxxxxxxxxxxxxx> #4.4 > > > > > Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx> > > > > > --- > > > > > 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 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html