Message ID | 1414421331-10299-1-git-send-email-tim.gardner@canonical.com |
---|---|
State | New |
Headers | show |
On 10/27/2014 07:48 AM, tim.gardner@canonical.com wrote: > From: Tim Gardner <tim.gardner@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1385510 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.master/config/config.common.ubuntu | 2 +- > debian.master/config/enforce | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 41b9773..2a21eb0 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -6715,7 +6715,7 @@ CONFIG_SONYPI_COMPAT=y > CONFIG_SONY_FF=y > CONFIG_SONY_LAPTOP=m > CONFIG_SOUND_OSS_CORE=y > -CONFIG_SOUND_OSS_CORE_PRECLAIM=y > +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set > # CONFIG_SOUND_PRIME is not set > CONFIG_SP5100_TCO=m > CONFIG_SPAPR_TCE_IOMMU=y > diff --git a/debian.master/config/enforce b/debian.master/config/enforce > index c6857a8..781121e 100644 > --- a/debian.master/config/enforce > +++ b/debian.master/config/enforce > @@ -28,6 +28,9 @@ value CONFIG_DEBUG_INFO y > (arch armel armhf &/ value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768) | \ > value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536 > > +#LP#1105230 and LP#1385510 > +!exists CONFIG_SOUND_OSS_CORE_PRECLAIM | value CONFIG_SOUND_OSS_CORE_PRECLAIM n > + > #LP#1374440 > !exists CONFIG_HOTPLUG_PCI_PCIE | (arch ppc64el &/ value CONFIG_HOTPLUG_PCI_PCIE n) | value CONFIG_HOTPLUG_PCI_PCIE y > >
On Mon, Oct 27, 2014 at 08:48:51AM -0600, tim.gardner@canonical.com wrote: > From: Tim Gardner <tim.gardner@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1385510 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.master/config/config.common.ubuntu | 2 +- > debian.master/config/enforce | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 41b9773..2a21eb0 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -6715,7 +6715,7 @@ CONFIG_SONYPI_COMPAT=y > CONFIG_SONY_FF=y > CONFIG_SONY_LAPTOP=m > CONFIG_SOUND_OSS_CORE=y > -CONFIG_SOUND_OSS_CORE_PRECLAIM=y > +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set > # CONFIG_SOUND_PRIME is not set > CONFIG_SP5100_TCO=m > CONFIG_SPAPR_TCE_IOMMU=y > diff --git a/debian.master/config/enforce b/debian.master/config/enforce > index c6857a8..781121e 100644 > --- a/debian.master/config/enforce > +++ b/debian.master/config/enforce > @@ -28,6 +28,9 @@ value CONFIG_DEBUG_INFO y > (arch armel armhf &/ value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768) | \ > value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536 > > +#LP#1105230 and LP#1385510 > +!exists CONFIG_SOUND_OSS_CORE_PRECLAIM | value CONFIG_SOUND_OSS_CORE_PRECLAIM n > + > #LP#1374440 > !exists CONFIG_HOTPLUG_PCI_PCIE | (arch ppc64el &/ value CONFIG_HOTPLUG_PCI_PCIE n) | value CONFIG_HOTPLUG_PCI_PCIE y > > -- > 1.9.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 41b9773..2a21eb0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6715,7 +6715,7 @@ CONFIG_SONYPI_COMPAT=y CONFIG_SONY_FF=y CONFIG_SONY_LAPTOP=m CONFIG_SOUND_OSS_CORE=y -CONFIG_SOUND_OSS_CORE_PRECLAIM=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set # CONFIG_SOUND_PRIME is not set CONFIG_SP5100_TCO=m CONFIG_SPAPR_TCE_IOMMU=y diff --git a/debian.master/config/enforce b/debian.master/config/enforce index c6857a8..781121e 100644 --- a/debian.master/config/enforce +++ b/debian.master/config/enforce @@ -28,6 +28,9 @@ value CONFIG_DEBUG_INFO y (arch armel armhf &/ value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768) | \ value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536 +#LP#1105230 and LP#1385510 +!exists CONFIG_SOUND_OSS_CORE_PRECLAIM | value CONFIG_SOUND_OSS_CORE_PRECLAIM n + #LP#1374440 !exists CONFIG_HOTPLUG_PCI_PCIE | (arch ppc64el &/ value CONFIG_HOTPLUG_PCI_PCIE n) | value CONFIG_HOTPLUG_PCI_PCIE y