Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753617AbYHAPVw (ORCPT ); Fri, 1 Aug 2008 11:21:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751311AbYHAPVm (ORCPT ); Fri, 1 Aug 2008 11:21:42 -0400 Received: from qb-out-0506.google.com ([72.14.204.234]:55783 "EHLO qb-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751258AbYHAPVl (ORCPT ); Fri, 1 Aug 2008 11:21:41 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding :sender; b=rcYSJ+0ase1RtrwzvCu5QoAK19qF+0SnQkEvnZbkoVsm09A0Nwr+GJrXUg7CoUdROr GEaaXc5aNuIxLubn8ppNcatvUAyAFMft+bvSdakzK9G/dYPpRWdxTyN+bGjk8XFNBwlS N1Q283LWdhqzlPR9CBNgBPbPcRs328UNHy980= Message-ID: <48932A10.8080004@tuffmail.co.uk> Date: Fri, 01 Aug 2008 16:21:52 +0100 From: Alan Jenkins User-Agent: Thunderbird 2.0.0.16 (X11/20080724) MIME-Version: 1.0 To: Jiri Slaby CC: Bob Copeland , tomasw@gmail.com, Dave Young , stable@kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linville@tuxdriver.com, Pekka Enberg , ath5k-devel@venema.h4ckr.net, johannes@sipsolutions.net, Andrew Morton Subject: Re: [ath5k-devel] [PATCH] ath5k : ath5k_config_interface deadlock fix References: <20080801074014.GA3341@darkstar> <4892C2CA.7010003@gmail.com> <4892C359.9000304@cs.helsinki.fi> <20080801011415.ff4821a3.akpm@linux-foundation.org> <4893257C.1020907@gmail.com> In-Reply-To: <4893257C.1020907@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2582 Lines: 78 Jiri Slaby wrote: > Bob Copeland napsal(a): > >> On Fri, Aug 1, 2008 at 4:14 AM, Andrew Morton wrote: >> >>> On Fri, 01 Aug 2008 11:03:37 +0300 Pekka Enberg wrote: >>> >>> >>>> Jiri Slaby wrote: >>>> >>>>> Dave Young napsal(a): >>>>> >>>>>> In the drivers/net/wireless/ath5k/base.c, there's recursive locking of >>>>>> sc->lock >>>>>> >>>>> Should be fixed already: >>>>> http://git.kernel.org/?p=linux/kernel/git/linville/wireless-2.6.git;a=commitdiff_plain;h=bc05116ab33d30342e2b4b1bcc6d6e1184e9df97 >>>>> >>>> I guess that didn't make it to -stable? >>>> >>> (cc stable!) >>> >> Not to worry, the commit that introduced it was >> 9d139c810a2aa17365cc548d0cd2a189d8433c65, which as far as I can tell >> came in after 2.6.26. >> > > git-describe 9d139c810a2aa17365cc548d0cd2a189d8433c65 > v2.6.26-rc8-1219-g9d139c8 > > Jiri Slaby wrote: > Bob Copeland napsal(a): > >> On Fri, Aug 1, 2008 at 4:14 AM, Andrew Morton wrote: >> >>> On Fri, 01 Aug 2008 11:03:37 +0300 Pekka Enberg wrote: >>> >>> >>>> Jiri Slaby wrote: >>>> >>>>> Dave Young napsal(a): >>>>> >>>>>> In the drivers/net/wireless/ath5k/base.c, there's recursive locking of >>>>>> sc->lock >>>>>> >>>>> Should be fixed already: >>>>> http://git.kernel.org/?p=linux/kernel/git/linville/wireless-2.6.git;a=commitdiff_plain;h=bc05116ab33d30342e2b4b1bcc6d6e1184e9df97 >>>>> >>>> I guess that didn't make it to -stable? >>>> >>> (cc stable!) >>> >> Not to worry, the commit that introduced it was >> 9d139c810a2aa17365cc548d0cd2a189d8433c65, which as far as I can tell >> came in after 2.6.26. >> > > git-describe 9d139c810a2aa17365cc548d0cd2a189d8433c65 > v2.6.26-rc8-1219-g9d139c8 > Unfortunately git-describe can be misleading. All this tells you is that the commit in question was based on (a descendant of) v2.6.26-rc8. It doesn't tell you whether the patch is present in v2.6.26. There must be a better way (for efficient merges, right?). But all I can think of is comparing the files in question against the diff. I checked myself and the changes don't appear to have been included in v2.6.26. Alan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/