Messages in this thread | | | Date | Thu, 5 Jan 2012 14:45:53 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the wireless-next tree with the net-next tree |
| |
Hi Larry,
On Wed, 04 Jan 2012 21:12:29 -0600 Larry Finger <Larry.Finger@lwfinger.net> wrote: > > On 01/04/2012 09:04 PM, Stephen Rothwell wrote: > > > > 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.
In this particular case, I think Dave asked Rusty to just do a net wide sweep - see the commit message:
commit 3db1cd5c05f35fb43eb134df6f321de4e63141f2 Author: Rusty Russell <rusty@rustcorp.com.au> Date: Mon Dec 19 13:56:45 2011 +0000
net: fix assignment of 0/1 to bool variables. DaveM said: Please, this kind of stuff rots forever and not using bool properly drives me crazy.
These conflicts are trivial in any case ... -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |