Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755441AbYHAPZz (ORCPT ); Fri, 1 Aug 2008 11:25:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751834AbYHAPZp (ORCPT ); Fri, 1 Aug 2008 11:25:45 -0400 Received: from fg-out-1718.google.com ([72.14.220.152]:24373 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751361AbYHAPZo (ORCPT ); Fri, 1 Aug 2008 11:25:44 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=vZnwy+yHo57c+WhcPd5ZYsu5IA2VlJDoc4KFnnMWqPV8VOf/mYR2jknz1KVE/HtO+D E6KP+TNqoPxFx7hjVOIaVULKqlPuBydMANCrGlbd+Hc1rm3mwQx8QxJh9Dx5q/eGspcA oGVlSDUmBu52LP2MInzD3H/cC5v8WyAuFHJ34= Message-ID: <48932AFA.5020903@gmail.com> Date: Fri, 01 Aug 2008 17:25:46 +0200 From: Jiri Slaby User-Agent: Thunderbird 2.0.0.16 (X11/20080720) MIME-Version: 1.0 To: Alan Jenkins 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: git-describe [Was: 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> <48932A10.8080004@tuffmail.co.uk> In-Reply-To: <48932A10.8080004@tuffmail.co.uk> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 611 Lines: 14 Alan Jenkins napsal(a): > 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. Ah, I see. Is this a git-describe bug or my misunderstanding of the tool? Sorry for the noise, it's not in 2.6.26. -- 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/