On Saturday, May 19, 2012 14:53:16 Sven Eckelmann wrote:

quoted

merge.patch -- this is the patch that can be used to create the merge of
next into merge after all remaining namespace patches are applied and
"batman- adv: Revert Distributed ARP Table" *is applied in next after
ccf1183f53baa879cd5a808dbb904f6053fa40f3*.



$ git merge --no-commit -s ours next
$ git apply --index merge.patch
$ git commit

I've attached the updated patch that is compatible with your changes in 
distributed-arp-table.c to my patches.

Applied in revision 206af11.

Thanks,
Marek