From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the staging tree with the net/wireless tree Date: Tue, 27 Oct 2009 07:13:25 -0700 Message-ID: <20091027141325.GA17352@kroah.com> References: <20091027183503.5c398311.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from kroah.org ([198.145.64.141]:38388 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754110AbZJ0OV2 (ORCPT ); Tue, 27 Oct 2009 10:21:28 -0400 Content-Disposition: inline In-Reply-To: <20091027183503.5c398311.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "John W. Linville" , "David S. Miller" , Johannes Berg , Holger Schurig On Tue, Oct 27, 2009 at 06:35:03PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in > drivers/net/wireless/Kconfig between commits > 3d23e349d807177eaf519d444677cee86b1a04cf ("wext: refactor") and > 0465af8e03bdc6cd0b49dc5548671387a8674b69 ("libertas: separate libertas' > Kconfig in it's own file") from the net/wireless tree and various commits > ("... move driver to staging") from the staging tree. > > I fixed it up (see below) and added a merge fixup (see further below) and > can carry these as necessary (though it may be easier for everyone (i.e. > me :-)) if these 4 staging tree commits are moved to the wireless > tree ...). John, I have no objection to these 4 commits going through your tree, if it will make these types of merge issues go away. If so, I have 4 more patches that should be added, adding the TODO files for the drivers. I can send them to you if you want to take them. thanks, greg k-h