From patchwork Mon Apr 25 15:04:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 614523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3qtqJN6f6vz9t42; Tue, 26 Apr 2016 01:04:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=aCt4E0M5; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1aui3t-0001yt-Ey; Mon, 25 Apr 2016 15:04:33 +0000 Received: from mail-io0-f182.google.com ([209.85.223.182]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.76) (envelope-from ) id 1aui3o-0001xC-1V for kernel-team@lists.ubuntu.com; Mon, 25 Apr 2016 15:04:28 +0000 Received: by mail-io0-f182.google.com with SMTP id f89so151940325ioi.0 for ; Mon, 25 Apr 2016 08:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=vUB6nKBarPkK7il5tjvpTUPAQZkSz37asvR9FURT+FM=; b=aCt4E0M5RQmrz1nnXF1IpTJQJEQVnuG3yjm5I7QVUxXtKN/pYiyH70HZyjveNGFmtj lnBabJak29GSgqbDaM2O/jdsGByngNYeh8j/ci0wH9SyK61nXH+O4sqJDci0wisK4KaG qZJMAny1Oip1qyY6luYZjQ73TtMqfUbNpkytE3qsgxwLtaAtEE4JhEeMChiucFfiB/cw 91VpxjyNYHUWCZ5LPKpC6q81I6WG2/701qUV0C/GGyaaeb5hLU8mFQ1uZfD28ys9E4sn B4rLdhckC/BJ8iBlpt+T2xmXQQ1KEMA9XFwLQkgTRoFT8YR+IVvxwzOYkqZzC9GbkBx4 d+FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=vUB6nKBarPkK7il5tjvpTUPAQZkSz37asvR9FURT+FM=; b=EeqnY2SSZyPU7FU+xJWGpfYrsRetmTTfLj2Y66qxXtcRFbWmGXB2lJhkEU66WZAO4t +N3l571kNAHb+CxZbPYQMneqkjjpbvA7FGtRz7Xj16IUq7V6HMUV2KShRyzY2tuKozV5 0fnh+bh4svUJAEAmSMpWwZAPPc1SEm05LQSgeqEq2oxL9bFDIZIFpCIQYLaIymdimDsr fn5cqNsUn/x+XlTaD+VZnnGLV13OKGCvgF1tUIXScwhYUcG49jLsME1bivoJDaK1DdLk BzV8vkPuLGoWmUbFx8YppnNMteocII9ZuULUGfkoTp39daMqwUbCNKtd8Wt0TjBEporL OqYw== X-Gm-Message-State: AOPr4FWt51DCnw/JhSw/NdaCKiUgMMv2DOGSitdNbpoUJlaSSB14qTMYZD3qLNxExXL2uDSG X-Received: by 10.107.8.85 with SMTP id 82mr14073745ioi.85.1461596666663; Mon, 25 Apr 2016 08:04:26 -0700 (PDT) Received: from localhost.localdomain (host-174-45-44-32.hln-mt.client.bresnan.net. [174.45.44.32]) by smtp.gmail.com with ESMTPSA id m143sm11570054ioe.43.2016.04.25.08.04.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Apr 2016 08:04:26 -0700 (PDT) From: tim.gardner@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH Xenial SRU] UBUNTU: [Config] CONFIG_VM86=y, CONFIG_X86_LEGACY_VM86=y Date: Mon, 25 Apr 2016 09:04:22 -0600 Message-Id: <1461596662-28696-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.9.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Tim Gardner BugLink: http://bugs.launchpad.net/bugs/1499089 Signed-off-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/config.common.ubuntu | 3 +-- debian.master/config/i386/config.common.i386 | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 3f616c4..2f89bb5 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -446,6 +446,7 @@ CONFIG_UWB=m CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VGASTATE=m CONFIG_VIRTIO_MMIO=y +# CONFIG_VM86 is not set CONFIG_VME_BUS=y CONFIG_VMXNET3=m CONFIG_VXFS_FS=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 505a3c7..b129731 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -8767,7 +8767,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m -# CONFIG_VM86 is not set CONFIG_VMCP=y CONFIG_VME_CA91CX42=m CONFIG_VME_PIO2=m @@ -8935,7 +8934,7 @@ CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_IO_APIC=y CONFIG_X86_L1_CACHE_SHIFT=6 -# CONFIG_X86_LEGACY_VM86 is not set +CONFIG_X86_LEGACY_VM86=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_LONGHAUL=m CONFIG_X86_LONGRUN=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index d749ac9..df5d5f8 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -441,6 +441,7 @@ CONFIG_UWB=m CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VGASTATE=m CONFIG_VIRTIO_MMIO=y +CONFIG_VM86=y CONFIG_VME_BUS=y CONFIG_VMXNET3=m CONFIG_VXFS_FS=m