From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752944Ab1HZFgB (ORCPT ); Fri, 26 Aug 2011 01:36:01 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:34461 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752101Ab1HZFf7 (ORCPT ); Fri, 26 Aug 2011 01:35:59 -0400 Message-ID: <4E5730BC.6070604@lwfinger.net> Date: Fri, 26 Aug 2011 00:35:56 -0500 From: Larry Finger User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110616 SUSE/3.1.11 Thunderbird/3.1.11 MIME-Version: 1.0 To: Greg KH CC: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Pirko , David Miller , netdev@vger.kernel.org Subject: Re: linux-next: manual merge of the staging tree with the net tree References: <20110826134705.0d5b6767777f0af2f8667731@canb.auug.org.au> <20110826043357.GA17686@kroah.com> In-Reply-To: <20110826043357.GA17686@kroah.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/25/2011 11:33 PM, Greg KH wrote: > On Fri, Aug 26, 2011 at 01:47:05PM +1000, Stephen Rothwell wrote: >> Hi Greg, >> >> Today's linux-next merge of the staging tree got a conflict in >> drivers/staging/rtl8192e/r8192E_core.c between commit afc4b13df143 ("net: >> remove use of ndo_set_multicast_list in drivers") from the net tree and >> commit 09505184ec3d ("staging: rtl8192e: Remove files that are not used") >> from the staging tree. >> >> The latter removed the file, so I did that. > > Thanks, that should be the correct thing :) I'm a little confused. The files deleted in 09505184ec3d are not used at all in the new rtl8192e. The only way it makes sense is you did not have the new version when the the error with r8192E_core.c occurred. The error that was reported to me was "drivers/staging/rtl8192e/rtl_core.c:2917:2: error: unknown field 'ndo_set_multicast_list' specified in initializer". The file rtl_core.c is needed with the new version. Yes, the names are quite confusing, which is part of the reason it took so long to delete the unused ones. I have tested Stephan's patch and will send it to Greg with my SOB. Larry