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 S1756530AbcJWJ5a (ORCPT <rfc822;w@1wt.eu>);
        Sun, 23 Oct 2016 05:57:30 -0400
Received: from mail.skyhub.de ([78.46.96.112]:47599 "EHLO mail.skyhub.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1756468AbcJWJ5Z (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 23 Oct 2016 05:57:25 -0400
Date: Sun, 23 Oct 2016 11:57:22 +0200
From: Borislav Petkov <bp@alien8.de>
To: sonofagun@openmailbox.org
Cc: linux-kernel@vger.kernel.org, Nikos Barkas <levelwol@gmail.com>
Subject: Re: [PATCH] x86/AMD: Apply erratum 688 on machines without a BIOS fix
Message-ID: <20161023095722.n77oefpmttzvzqqc@pd.tnic>
References: <f91808d9d3929727a18e267e3081ff98@openmailbox.org>
 <20161021164723.c5rh7kgulba2aq6i@pd.tnic>
 <ac4f6408af04006ed7b6aa6c91582847@openmailbox.org>
 <20161021230143.4wwop3giwwuzbkpr@pd.tnic>
 <52b804e35d9e82a46b35409586475ee2@openmailbox.org>
 <20161022141229.4us4iqy7dhgulssn@pd.tnic>
 <1651fbd1076bc365aef52a804d1ffbad@openmailbox.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <1651fbd1076bc365aef52a804d1ffbad@openmailbox.org>
User-Agent: NeoMutt/20161014 (1.7.1)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Oct 23, 2016 at 12:39:37PM +0300, sonofagun@openmailbox.org wrote:
> Last night attempt failed as patch does not apply to 4.8. Neither 4.8.1 nor
> 4.8.4. Did you switch to 4.9? Please use 4.8 as we prefer to avoid rc
> kernels as we had casualties in the past. Do you want to add changes by
> hand?

Are you sure you did it right?

I saved the mail I sent you before in /tmp/e688.mail.

$ git checkout v4.8.1
Previous HEAD position was e58b634ca001... Merge branch 'tip-microcode-rc1+' into rc1+1
HEAD is now at a7fac751ddba... Linux 4.8.1
$ patch -p1 --dry-run -i /tmp/e688.mail
checking file arch/x86/kernel/amd_nb.c
$ git checkout v4.8.3
Previous HEAD position was a7fac751ddba... Linux 4.8.1
HEAD is now at 1888926ea8d2... Linux 4.8.3
$ patch -p1 --dry-run -i /tmp/e688.mail
checking file arch/x86/kernel/amd_nb.c
$ git checkout v4.8
Previous HEAD position was 1888926ea8d2... Linux 4.8.3
HEAD is now at c8d2bc9bc39e... Linux 4.8
$ patch -p1 --dry-run -i /tmp/e688.mail
checking file arch/x86/kernel/amd_nb.c

Now you only have to remove "--dry-run"

Paste here the error messages when trying to apply it.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.