From patchwork Thu Jun 17 15:21:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 56058 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 73B63B7D5B for ; Fri, 18 Jun 2010 01:21:53 +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 1OPGuY-0003Hc-N7; Thu, 17 Jun 2010 16:21:46 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OPGuW-0003HS-PF for kernel-team@lists.ubuntu.com; Thu, 17 Jun 2010 16:21:44 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OPGuW-0007VL-NK; Thu, 17 Jun 2010 16:21:44 +0100 Received: from [70.114.236.114] (helo=hungry.local) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OPGuW-0000NX-Ds; Thu, 17 Jun 2010 16:21:44 +0100 Date: Thu, 17 Jun 2010 10:21:32 -0500 (CDT) From: manoj.iyer@canonical.com To: Andy Whitcroft Subject: Re: [Maverick] switch to new firewire stack. In-Reply-To: <20100617091930.GC4361@shadowen.org> Message-ID: References: <20100617091930.GC4361@shadowen.org> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Cc: Ubuntu Kernel Team 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 Resending patch modified as per apw's comments. # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: manoj.iyer@canonical.com-20100617151812-\ # mixlvx9mvhb3y1m1 # target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-\ # branches/ubuntu/maverick/module-init-tools/maverick/ # testament_sha1: e77c73fa00a61b8307ee5b1908f92b6a97d04649 # timestamp: 2010-06-17 10:19:17 -0500 # base_revision_id: scott@netsplit.com-20100607153501-04lamqgljxjgmhbt # # Begin patch # Begin bundle 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 Cheers --- manjo On Thu, 17 Jun 2010, Andy Whitcroft wrote: > On Wed, Jun 16, 2010 at 12:45:04PM -0500, Manoj Iyer wrote: > >> # Bazaar merge directive format 2 (Bazaar 0.90) >> # revision_id: manoj.iyer@canonical.com-20100615183844-\ >> # w76q9m8piz9rwnct >> # target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-\ >> # branches/ubuntu/maverick/module-init-tools/maverick/ >> # testament_sha1: cc3e9eb552c741535f6c12fbf826c1dc5f17f4f9 >> # timestamp: 2010-06-15 13:42:49 -0500 >> # base_revision_id: scott@netsplit.com-20100607153501-04lamqgljxjgmhbt >> # # Begin patch >> === modified file 'debian/modprobe.d/blacklist-firewire.conf' >> --- debian/modprobe.d/blacklist-firewire.conf 2009-03-09 13:33:38 +0000 >> +++ debian/modprobe.d/blacklist-firewire.conf 2010-06-15 18:38:44 +0000 >> @@ -1,10 +1,8 @@ >> # Select the legacy firewire stack over the new CONFIG_FIREWIRE one. >> >> -#blacklist ohci1394 >> -#blacklist sbp2 >> -#blacklist dv1394 >> -#blacklist raw1394 >> -#blacklist video1394 >> - >> -blacklist firewire-ohci >> -blacklist firewire-sbp2 >> +blacklist ohci1394 >> +blacklist sbp2 >> +blacklist eth1394 >> +blacklist dv1394 >> +blacklist raw1394 >> +blacklist video1394 > > I think it might make more sense to just switch the commenting, you are > removing the new ones so its harder for someone to revert back to > confirm a problem with the new stack. > > -apw > === modified file 'debian/modprobe.d/blacklist-firewire.conf' --- debian/modprobe.d/blacklist-firewire.conf 2009-03-09 13:33:38 +0000 +++ debian/modprobe.d/blacklist-firewire.conf 2010-06-17 15:18:12 +0000 @@ -1,10 +1,12 @@ -# Select the legacy firewire stack over the new CONFIG_FIREWIRE one. - -#blacklist ohci1394 -#blacklist sbp2 -#blacklist dv1394 -#blacklist raw1394 -#blacklist video1394 - -blacklist firewire-ohci -blacklist firewire-sbp2 +# Select the new firewire stack over the legacy one. To switch back to +# legacy stack reverse the commenting and rebuild initramfs. + +blacklist ohci1394 +blacklist sbp2 +blacklist eth1394 +blacklist dv1394 +blacklist raw1394 +blacklist video1394 + +#blacklist firewire-ohci +#blacklist firewire-sbp2