Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756925AbZCYJfP (ORCPT ); Wed, 25 Mar 2009 05:35:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755880AbZCYJe5 (ORCPT ); Wed, 25 Mar 2009 05:34:57 -0400 Received: from ey-out-2122.google.com ([74.125.78.26]:15423 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754995AbZCYJe4 (ORCPT ); Wed, 25 Mar 2009 05:34:56 -0400 MIME-Version: 1.0 In-Reply-To: <20090324.232931.65484505.davem@davemloft.net> References: <20090325001659.GA22461@kroah.com> <1237940825-22904-15-git-send-email-gregkh@suse.de> <20090324.232931.65484505.davem@davemloft.net> Date: Wed, 25 Mar 2009 10:34:53 +0100 Message-ID: Subject: Re: [PATCH 15/61] net: struct device - replace bus_id with dev_name(), dev_set_name() From: Kay Sievers To: David Miller Cc: gregkh@suse.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1401 Lines: 36 On Wed, Mar 25, 2009 at 07:29, David Miller wrote: > From: Greg Kroah-Hartman > Date: Tue, 24 Mar 2009 17:26:19 -0700 > >> From: Kay Sievers >> >> Cc: davem@davemloft.net >> Cc: netdev@vger.kernel.org >> Acked-by: Greg Kroah-Hartman >> Signed-off-by: Kay Sievers > > None of this patch applies to net-next-2.6 > > Probably because, just like the wimax case, these changes > are already there. Yeah, I think -next handles duplicate and completely indentical patches from differnt trees just fine, so that all has been in -next for a while, and while it was still in Greg's tree when the other tree merged it. This patch is in your -next tree: http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commit;h=db1d7bf70f42124f73675fca62fe32f3ab1111b4 The problem with -next is that if some tree is dropped because of a non-trivial conflict, and Greg removes merged patches, later patches in Greg's tree may fail because of missing changes. Maybe we need some kind of annotation with the -next logic to handle such cases better? Thanks, Kay -- 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/