Subject: Re: linux-next: manual merge of the wireless-next tree with the net-next tree

From: David Miller <[email-masked]>
Date: Wed, 04 Jan 2012 22:30:52 -0500 (EST)

From: Larry Finger <[email-masked]>
Date: Wed, 04 Jan 2012 21:12:29 -0600

> 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.

It was a networking wide change and it's easiest if I just take it
in and deal with the merge issues.