From patchwork Sat Apr 24 01:09:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 50880 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 33F05B7D4C for ; Sat, 24 Apr 2010 11:09:39 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O5TsB-0002Ga-Km; Sat, 24 Apr 2010 02:09:31 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O5Ts9-0002GR-T5 for kernel-team@lists.ubuntu.com; Sat, 24 Apr 2010 02:09:29 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O5Ts9-0007Rx-Rq for ; Sat, 24 Apr 2010 02:09:29 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1O5Ts9-0002lm-Fo for kernel-team@lists.ubuntu.com; Sat, 24 Apr 2010 02:09:29 +0100 Subject: [PATCH 1/1] [Lucid] SRU: UBUNTU: [Config] Enable multicast routing for sparc From: Leann Ogasawara To: kernel-team Date: Fri, 23 Apr 2010 18:09:25 -0700 Message-ID: <1272071365.15934.339.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Hi All, https://bugs.edge.launchpad.net/ubuntu/+source/linux/+bug/416266 Lucid SRU Justification: Impact: Multicast routing was enabled for sparc in Hardy as an SRU. Unfortunately the change doesn't appear to have been pulled forward into Lucid (an oversight on my part). Please consider the following patch which enables CONFIG_IP_MROUTE=y for sparc in Lucid. Testcase: Install and run a sparc Lucid kernel and confirm that multicast routing is not supported (including PIM1 and PIM2). Install the corresponding patched Lucid kernel, reboot, and confirm multicast routing is now supported. Thanks, Leann The following changes since commit 44dbdb13eab1b5813a6dbe25cd3e2b52bae46e10: Andy Whitcroft (1): UBUNTU: [Config] enforce -- ensure dm_mod is built-in for LVM are available in the git repository at: git://kernel.ubuntu.com/ogasawara/ubuntu-lucid lp416266 Leann Ogasawara (1): UBUNTU: [Config] Enable multicast routing for sparc debian.master/config/config.common.ports | 1 + debian.master/config/ia64/config.common.ia64 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/sparc/config.common.sparc | 1 - 4 files changed, 1 insertions(+), 3 deletions(-) >From a68fb32dcb069c275f77a6c6f8c3d760ba80902c Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Fri, 23 Apr 2010 11:35:14 -0700 Subject: [PATCH] UBUNTU: [Config] Enable multicast routing for sparc BugLink: http://bugs.launchpad.net/bugs/416266 Multicast routing was enabled for sparc in Hardy as an SRU. Unfortunately, the change doesn't appear to have been pulled forward into Lucid. Enable CONFIG_IP_MROUTE=y for sparc. Signed-off-by: Leann Ogasawara Acked-by: Stefan Bader Acked-by: Andy Whitcroft --- debian.master/config/config.common.ports | 1 + debian.master/config/ia64/config.common.ia64 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/sparc/config.common.sparc | 1 - 4 files changed, 1 insertions(+), 3 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 6e1517c..6548ed9 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -1437,6 +1437,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100 CONFIG_IP_DCCP_TFRC_LIB=y CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_MROUTE=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index ea554e3..711fe90 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -117,7 +117,6 @@ CONFIG_INPUT_UINPUT=m # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_TUNNEL is not set # CONFIG_IP_DCCP is not set -CONFIG_IP_MROUTE=y # CONFIG_IP_NF_QUEUE is not set # CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_MULTIPATH=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index a7cfcc0..1ad3193 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -107,7 +107,6 @@ CONFIG_IPMI_POWEROFF=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_TUNNEL=m CONFIG_IP_DCCP=m -CONFIG_IP_MROUTE=y CONFIG_IP_NF_QUEUE=m # CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_MULTIPATH=y diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index 95c5472..89ffb7c 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -120,7 +120,6 @@ CONFIG_IPMI_HANDLER=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_TUNNEL=m CONFIG_IP_DCCP=m -# CONFIG_IP_MROUTE is not set CONFIG_IP_NF_QUEUE=m CONFIG_IP_PNP=y # CONFIG_IP_ROUTE_MULTIPATH is not set