From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larry Finger Subject: Re: linux-next: manual merge of the wireless-next tree with the net-next tree Date: Wed, 04 Jan 2012 21:12:29 -0600 Message-ID: <4F05151D.5070401@lwfinger.net> References: <20120105140405.92816482d364abfcf3854d74@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-vw0-f46.google.com ([209.85.212.46]:55018 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752763Ab2AEDMd (ORCPT ); Wed, 4 Jan 2012 22:12:33 -0500 In-Reply-To: <20120105140405.92816482d364abfcf3854d74@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: "John W. Linville" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Rusty Russell , David Miller , netdev@vger.kernel.org On 01/04/2012 09:04 PM, Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless-next tree got a conflict in > drivers/net/wireless/b43legacy/dma.c between commit 3db1cd5c05f3 ("net: > fix assignment of 0/1 to bool variables") from the net-next tree and > commit 5d07a3d62f63 ("b43legacy: Avoid packet losses in the dma worker > code") from the wireless-next tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Is there a good explanation why changes in wireless drivers are sent to net-next, and not wireless-testing? If that were stopped, this kind of conflict would be avoided. Larry