diff mbox

[Xenial,SRU] UBUNTU: [Config] CONFIG_VM86=y, CONFIG_X86_LEGACY_VM86=y

Message ID 1461596662-28696-1-git-send-email-tim.gardner@canonical.com
State New
Headers show

Commit Message

Tim Gardner April 25, 2016, 3:04 p.m. UTC 
From: Tim Gardner <tim.gardner@canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1499089

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 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(-)

Comments

Kamal Mostafa April 25, 2016, 3:17 p.m. UTC | #1 
ACK for Xenial (Wily has had these enabled since October 2015).

 -Kamal
Stefan Bader April 26, 2016, 7:52 a.m. UTC | #2 
On 25.04.2016 17:04, tim.gardner@canonical.com wrote:
> From: Tim Gardner <tim.gardner@canonical.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1499089

I feel rather like NAK until this has been applied to Yakkety. Apparently it was
lost for probably similar reasons between Wily and Xenial.
And I am pretty sure I was looking at the Wily variant and whining about the
fact that the commit has no reasons nor cares about putting it into the enforcer
or whatever in-tree doc is appropriate.

-Stefan

[written with on low coffee levels and in the usual morning mood]

> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  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
>
Andy Whitcroft April 26, 2016, 8:54 a.m. UTC | #3 
To ensure we do not lose this again I have applied this premptivly to
yakkety.

Applied to yakkety.

-apw
Andy Whitcroft April 26, 2016, 8:56 a.m. UTC | #4 
On Tue, Apr 26, 2016 at 09:52:55AM +0200, Stefan Bader wrote:
> On 25.04.2016 17:04, tim.gardner@canonical.com wrote:
> > From: Tim Gardner <tim.gardner@canonical.com>
> > 
> > BugLink: http://bugs.launchpad.net/bugs/1499089
> 
> I feel rather like NAK until this has been applied to Yakkety. Apparently it was
> lost for probably similar reasons between Wily and Xenial.
> And I am pretty sure I was looking at the Wily variant and whining about the
> fact that the commit has no reasons nor cares about putting it into the enforcer
> or whatever in-tree doc is appropriate.

I have applied this (with my annotations change) to what will become
yakkety (the unstable tree).

-apw
Andy Whitcroft April 26, 2016, 8:57 a.m. UTC | #5 
Applied to xenial master-next.

-apw
diff mbox

Patch

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