From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758660AbYD3ACS (ORCPT ); Tue, 29 Apr 2008 20:02:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754734AbYD3ACJ (ORCPT ); Tue, 29 Apr 2008 20:02:09 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:43897 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754705AbYD3ACI (ORCPT ); Tue, 29 Apr 2008 20:02:08 -0400 Date: Tue, 29 Apr 2008 21:00:03 -0300 From: Mauro Carvalho Chehab To: "Michael Krufky" Cc: "Linus Torvalds" , linux-dvb-maintainer@linuxtv.org, "Andrew Morton" , video4linux-list@redhat.com, linux-kernel@vger.kernel.org Subject: Re: [v4l-dvb-maintainer] [GIT PATCHES] V4L/DVB updates and fixes for 2.6.26 Message-ID: <20080429210003.14f6c9c7@gaivota> In-Reply-To: <37219a840804291649q36638464ye2d57cf8184580a4@mail.gmail.com> References: <20080429185009.716c3284@gaivota> <37219a840804291649q36638464ye2d57cf8184580a4@mail.gmail.com> X-Mailer: Claws Mail 3.4.0 (GTK+ 2.12.9; x86_64-mandriva-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 29 Apr 2008 19:49:24 -0400 "Michael Krufky" wrote: > On Tue, Apr 29, 2008 at 5:50 PM, Mauro Carvalho Chehab > wrote: > > Linus, > > > > Please pull from: > > ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git master > > > > For the following: > > > > - Fixes on mtm001, mtv022, pvrusb2, ivtv, cx88 and saa7134; > > - new board additions on saa7134 and ivtv; > > - load tuners only when needed; > > - reorganization of tuner drivers that are shared between DVB and V4L; > > - Addition of a new driver for Conexant CX23418 MPEG encoder chip (cx18). > > [snip] > > > Mauro Carvalho Chehab (9): > > Rename common tuner Kconfig names to use the same > > > > Michael Krufky (4): > > V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules > > > Linus has already merged the changes (thank you, Linus) ... However, > there is a bug. > > My "remove static dependencies on analog tuner sub-modules" patch was > applied after Mauro's "Rename common tuner Kconfig names to use the > same" patch. > > My patch has conditional behavior, based on CONFIG_DVB_CORE_ATTACH, > which was renamed to CONFIG_MEDIA_ATTACH in Mauro's patch. > > To fix this, we need to do: > > sed -i s/"CONFIG_DVB_CORE_ATTACH"/"CONFIG_MEDIA_ATTACH"/1 > drivers/media/video/tuner-core.c > > The issue will cause invalid module use counts upon unloading analog > tuner modules, if CONFIG_MEDIA_ATTACH is enabled. > > I would be happy to fix this myself, but Mauro's patch has not yet > been backported into the linuxtv.org repository. > > Mauro, can you do the above fix and send it in to Linus? Sure. Merge conflicts... bah... I'll also double check if there aren't also other conflicts. It is just a matter or run the sed script again ;) Cheers, Mauro