From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754359AbZKQIVo (ORCPT ); Tue, 17 Nov 2009 03:21:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753991AbZKQIVn (ORCPT ); Tue, 17 Nov 2009 03:21:43 -0500 Received: from out02.mta.xmission.com ([166.70.13.232]:47487 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753824AbZKQIVm (ORCPT ); Tue, 17 Nov 2009 03:21:42 -0500 To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet , "David S. Miller" Subject: Re: linux-next: manual merge of the sysctl tree with Linus' tree References: <20091117190406.108f967d.sfr@canb.auug.org.au> From: ebiederm@xmission.com (Eric W. Biederman) Date: Tue, 17 Nov 2009 00:21:43 -0800 In-Reply-To: <20091117190406.108f967d.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Tue\, 17 Nov 2009 19\:04\:06 +1100") Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-XM-SPF: eid=;;;mid=;;;hst=in02.mta.xmission.com;;;ip=76.21.114.89;;;frm=ebiederm@xmission.com;;;spf=neutral X-SA-Exim-Connect-IP: 76.21.114.89 X-SA-Exim-Mail-From: ebiederm@xmission.com X-SA-Exim-Version: 4.2.1 (built Thu, 25 Oct 2007 00:26:12 +0000) X-SA-Exim-Scanned: No (on in02.mta.xmission.com); Unknown failure Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > Hi Eric, > > Today's linux-next merge of the sysctl tree got a conflict in > net/decnet/sysctl_net_decnet.c between commit > 887e671f324d9898aaedb29a6ece6c853c394067 ("decnet: netdevice refcount > leak") from Linus' tree and commit > f8572d8f2a2ba75408b97dc24ef47c83671795d7 ("sysctl net: Remove unused > binary sysctl code") from the sysctl tree. > > The latter removed the code (function dn_def_dev_strategy()) modified by > the former, so I just used the latter. I can carry this fix for a while, > but it can be fixed by merging v2.6.32-rc7 (or just the > above commit from Linus' tree - which would merge a much smaller number of > commits) into the sysctl tree. Nice. I had not realized that bug fix had made it into v2.6.32-rc7. I will look at merging that to remove the conflict. I looked at cherry-picking the commit earlier when I saw it in the netdev tree and my experiment failed. So I think the only resolution that works in this case is merging it so the whole history is there. Eric