From: Antonio Quartulli ordex@autistici.org Date: Tue, 25 Sep 2012 17:57:15 +0200
here are two fixes (the last set) we would to propose for net/linux-3.6.
The one from Def fixes a wrong behaviour of batman-adv in case of virtual interface mac address change, while the other from LinĂ¼s fixes a problem in the route selection which can lead to a continuous route flapping under certain conditions.
We would also like to enqueue both patches for sending to stable-3.5.
During merge with net/master you will hit a conflict. I'm going to send some instructions on how to solve it.
...
git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem
Pulled, thanks.