Messages in this thread | | | Date | Wed, 28 Sep 2011 01:36:52 -0400 (EDT) | Subject | Re: linux-next: manual merge of the net tree with the net-current tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 28 Sep 2011 12:54:28 +1000
> Today's linux-next merge of the net tree got a conflict in > net/batman-adv/soft-interface.c between commit 8b267b312df9 ("batman-adv: > do_bcast has to be true for broadcast packets only") from the net-current > tree and commit 3d393e473210 ("batman-adv: implement AP-isolation on the > sender side") from the net tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Yep, I'll do a merge soon to fix this up for good, thanks Stephen!
| |