From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Arend van Spriel" Subject: Re: linux-next: manual merge of the staging tree with the staging.current tree Date: Mon, 31 Jan 2011 09:52:03 +0100 Message-ID: References: <20110131160926.27223d25.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mms2.broadcom.com ([216.31.210.18]:1261 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755253Ab1AaIwU (ORCPT ); Mon, 31 Jan 2011 03:52:20 -0500 In-Reply-To: <20110131160926.27223d25.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH , Stephen Rothwell Cc: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" Hi Stephen, On Mon, 31 Jan 2011 06:09:26 +0100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/brcm80211/brcmsmac/wl_mac80211.c, > drivers/staging/brcm80211/sys/wlc_mac80211.c and > drivers/staging/brcm80211/sys/wlc_mac80211.c (these three files names are > the same file, it has been renamed twice, I think ..) between wl_mac80211.c and wlc_mac80211.c are different source files. The driver source tree has been restructured in the staging-next branch and files that were located in brcm80211/sys are moved to brcm80211/brcmsmac. > > I fixed it up (see below) and can carry the fix as necessary. The fix looks ok and I also verified the wl_mac80211.c in linux-next on gitweb. Regards, Arend van Spriel -- "The most merciful thing in the world, I think, is the inability of the human mind to correlate all its contents." - "The Call of Cthulhu"