Re: [B.A.T.M.A.N.] [PATCH-next] batman-adv: Remove unused compat function batadv_free_rcu_softif_vlan

On Wednesday 22 April 2015 21:12:42 Sven Eckelmann wrote:

The commit e78c16c0550c ("batman-adv: Revert "fix var name to keep compatibility with old kernels"") should have renamed the function to batadv_free_rcu_softif_vlan instead of adding a new function batadv_free_rcu_vlan because it was only used in this single place.

Signed-off-by: Sven Eckelmann sven@narfation.org

This patch is complete optional and would only silence a build_test warning until the master branch becomes the next branch. But this would create a merge conflict because batadv_free_rcu_softif_vlan is already removed in master.

Just as hint: If only this patch is new in next and you want to merge then you could merge by ignoring the changes in next to avoid the merge conflict:

git merge -s ours next

Kind regards, Sven