| Message ID | 20180530113817.14784-4-juergh@canonical.com |
|---|---|
| State | New |
| Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40wpWc5WkKz9s23; Wed, 30 May 2018 21:38:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1fNzQz-0006Fj-SU; Wed, 30 May 2018 11:38:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from <juerg.haefliger@canonical.com>) id 1fNzQu-0006DD-A6 for kernel-team@lists.ubuntu.com; Wed, 30 May 2018 11:38:24 +0000 Received: from mail-wm0-f72.google.com ([74.125.82.72]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from <juerg.haefliger@canonical.com>) id 1fNzQu-0006SC-2D for kernel-team@lists.ubuntu.com; Wed, 30 May 2018 11:38:24 +0000 Received: by mail-wm0-f72.google.com with SMTP id f65-v6so5735285wmd.2 for <kernel-team@lists.ubuntu.com>; Wed, 30 May 2018 04:38:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=MB8M+QEQb8G6OvNEuQ13vnrGfgkoJZfe1z9ROv1+i2k=; b=lq9QZDMxCEmBlWL46ZhPv4JkTn68mcT2ItRY9XO29fx3Jlr9/iQjzFmPvzkTDrBe4q NkI6HSWJbDdsSfeAFjizjlHjuxgsz7qoA839mBLRDmqAjJ70AYMDwvy0FZNZHmUKbcm2 +lqfTKzV0p70I2AjJaWgpV/Hbpy1D4ORi/mJa5rUVGbaLjgSzh1jaJ2gOKoqf/92yIh1 YmGsP/EBcgsNdQGJTeqTnoIg/wyJwD6a3OjmhR8gemO8Hv5h/tamvHGbQ+P5ISsHUxlW Tkts6qZLjkZzse0owY4qgIsswmnOCfgCJOClDF0WE/lzfipVMMy/B7d4DfeNvSiljUQ0 kW9Q== X-Gm-Message-State: ALKqPwcpm0A4Uv3Y4xi/kz0vQe39grvXfP9gmHWqT/hW9cljmzbeKWiu 0OVhPSrGSNQpVgcLvZjtMLgGeI4l4p9m/JiGFbWidzPjrBPpyKwgoItKf4Vo41G0RqDg77Q+adP nOY/wRxI75WoZm/Z9mTQj3Xc/u80ePejweF6gkuNJKw== X-Received: by 2002:a50:97e1:: with SMTP id f30-v6mr3082570edb.256.1527680303653; Wed, 30 May 2018 04:38:23 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLDBjScPYWCLnLYWahUux/dSeH1dKnyxtbd8pwd4IU/pFobi1rdrIOpr47vgStCS4DfTNRMtA== X-Received: by 2002:a50:97e1:: with SMTP id f30-v6mr3082563edb.256.1527680303536; Wed, 30 May 2018 04:38:23 -0700 (PDT) Received: from localhost.localdomain ([81.221.205.149]) by smtp.gmail.com with ESMTPSA id g1-v6sm9265853edi.41.2018.05.30.04.38.22 for <kernel-team@lists.ubuntu.com> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 04:38:22 -0700 (PDT) From: Juerg Haefliger <juerg.haefliger@canonical.com> X-Google-Original-From: Juerg Haefliger <juergh@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PATCH 3/6] UBUNTU: SAUCE: x86: Remove double include Date: Wed, 30 May 2018 13:38:14 +0200 Message-Id: <20180530113817.14784-4-juergh@canonical.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530113817.14784-1-juergh@canonical.com> References: <20180530113817.14784-1-juergh@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
| Series |
Fixups for CVE-2018-3639 (x86)
|
expand
|
diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h index 196f98393b34..9821763b02cf 100644 --- a/arch/x86/include/asm/mwait.h +++ b/arch/x86/include/asm/mwait.h @@ -5,7 +5,6 @@ #include <asm/cpufeature.h> #include <asm/spec_ctrl.h> -#include <asm/spec-ctrl.h> #include <asm/microcode.h> #define MWAIT_SUBSTATE_MASK 0xf
CVE-2018-3639 (x86) Fixes: f3b21b13cecf ("UBUNTU: SAUCE: x86/bugs: Honour SPEC_CTRL default") Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- arch/x86/include/asm/mwait.h | 1 - 1 file changed, 1 deletion(-)