Message ID | 5842097a-23a3-0fde-523a-081bc24393f2@canonical.com |
---|---|
State | New |
Headers | show |
On Wed, Feb 01, 2017 at 12:57:09PM -0700, Tim Gardner wrote: > On 02/01/2017 03:18 AM, Stefan Bader wrote: > > On 31.01.2017 15:55, Tim Gardner wrote: > >> BugLink: http://bugs.launchpad.net/bugs/1660634 > > > > ... > > > >> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > >> index 74860bf..4108fa3 100644 > >> --- a/debian.master/config/powerpc/config.common.powerpc > >> +++ b/debian.master/config/powerpc/config.common.powerpc > >> @@ -228,7 +228,7 @@ CONFIG_IPV6_MIP6=m > >> # CONFIG_IP_DCCP_CCID3 is not set > >> # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set > >> # CONFIG_IRQ_ALL_CPUS is not set > >> -CONFIG_IRQ_BYPASS_MANAGER=m > >> +CONFIG_IRQ_BYPASS_MANAGER=y > >> # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set > > > > Guess generally ok to make NET_DROP_MONITOR=m (as long as it being there will > > not change behaviour without explicit loading). But why is IRQ_BYPASS_MANAGER > > changed? > > > > -Stefan > > > > Why indeed. Looks like yours truly forgot to updateconfigs after 'KVM: > PPC: select IRQ_BYPASS_MANAGER'. I've pushed a patch to correct that > oversight, "UBUNTU: [Config] IRQ_BYPASS_MANAGER=y". See attached version > 2 of the NET_DROP_MONITOR=m patch. > > rtg > -- > Tim Gardner tim.gardner@canonical.com > From 5641e43f2d3877f1a8037bec6f9026cec5230e73 Mon Sep 17 00:00:00 2001 > From: Tim Gardner <tim.gardner@canonical.com> > Date: Wed, 1 Feb 2017 12:53:36 -0700 > Subject: [PATCH Yakkety SRU V2] UBUNTU: [Config] CONFIG_NET_DROP_MONITOR=m > > BugLink: http://bugs.launchpad.net/bugs/1660634 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 - > debian.master/config/arm64/config.common.arm64 | 1 - > debian.master/config/armhf/config.common.armhf | 1 - > debian.master/config/config.common.ubuntu | 1 + > debian.master/config/i386/config.common.i386 | 1 - > debian.master/config/powerpc/config.common.powerpc | 1 - > debian.master/config/ppc64el/config.common.ppc64el | 1 - > debian.master/config/s390x/config.common.s390x | 1 - > 8 files changed, 1 insertion(+), 7 deletions(-) The new patch is missing the annotations updates from the original version.
From 5641e43f2d3877f1a8037bec6f9026cec5230e73 Mon Sep 17 00:00:00 2001 From: Tim Gardner <tim.gardner@canonical.com> Date: Wed, 1 Feb 2017 12:53:36 -0700 Subject: [PATCH Yakkety SRU V2] UBUNTU: [Config] CONFIG_NET_DROP_MONITOR=m BugLink: http://bugs.launchpad.net/bugs/1660634 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/s390x/config.common.s390x | 1 - 8 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 7ff7a36..f37b9e1 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -362,7 +362,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y # CONFIG_NET_ACT_IFE is not set CONFIG_NET_CADENCE=y # CONFIG_NET_CLS_IND is not set -# CONFIG_NET_DROP_MONITOR is not set # CONFIG_NET_KEY_MIGRATE is not set CONFIG_NET_MPLS_GSO=m CONFIG_NET_PACKET_ENGINE=y diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index d0bdc59..68c71fe 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -396,7 +396,6 @@ CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NET_ACT_IFE is not set CONFIG_NET_CADENCE=y # CONFIG_NET_CLS_IND is not set -# CONFIG_NET_DROP_MONITOR is not set # CONFIG_NET_KEY_MIGRATE is not set CONFIG_NET_MPLS_GSO=m CONFIG_NET_PACKET_ENGINE=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 08056c1..93b834c 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -378,7 +378,6 @@ CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NET_ACT_IFE is not set CONFIG_NET_CADENCE=y # CONFIG_NET_CLS_IND is not set -# CONFIG_NET_DROP_MONITOR is not set # CONFIG_NET_KEY_MIGRATE is not set CONFIG_NET_MPLS_GSO=m CONFIG_NET_PACKET_ENGINE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 98ed6af..127753f 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5197,6 +5197,7 @@ CONFIG_NET_CLS_U32=m CONFIG_NET_CORE=y CONFIG_NET_DCCPPROBE=m CONFIG_NET_DEVLINK=m +CONFIG_NET_DROP_MONITOR=m CONFIG_NET_DSA=m CONFIG_NET_DSA_BCM_SF2=m CONFIG_NET_DSA_HWMON=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 6df848a..8f81339 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -357,7 +357,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y # CONFIG_NET_ACT_IFE is not set CONFIG_NET_CADENCE=y # CONFIG_NET_CLS_IND is not set -# CONFIG_NET_DROP_MONITOR is not set # CONFIG_NET_KEY_MIGRATE is not set CONFIG_NET_MPLS_GSO=m CONFIG_NET_PACKET_ENGINE=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 34e8589..4108fa3 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -334,7 +334,6 @@ CONFIG_MTD_OF_PARTS=m CONFIG_NATIONAL_PHY=m CONFIG_NET_CADENCE=y # CONFIG_NET_CLS_IND is not set -# CONFIG_NET_DROP_MONITOR is not set # CONFIG_NET_KEY_MIGRATE is not set CONFIG_NET_MPLS_GSO=m CONFIG_NET_PACKET_ENGINE=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index b8ce49b..3a0cf05 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -373,7 +373,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y # CONFIG_NET_ACT_IFE is not set CONFIG_NET_CADENCE=y # CONFIG_NET_CLS_IND is not set -# CONFIG_NET_DROP_MONITOR is not set # CONFIG_NET_KEY_MIGRATE is not set CONFIG_NET_MPLS_GSO=m CONFIG_NET_PACKET_ENGINE=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index ee66e47..55f98dc 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -311,7 +311,6 @@ CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NET_ACT_IFE is not set # CONFIG_NET_CADENCE is not set CONFIG_NET_CLS_IND=y -CONFIG_NET_DROP_MONITOR=m CONFIG_NET_KEY_MIGRATE=y CONFIG_NET_MPLS_GSO=y # CONFIG_NET_PACKET_ENGINE is not set -- 2.7.4