Hi,
there are some patches waiting in batman-adv's next branch which are currently missing in davem's net-next. The diff from the daily build_test is stable since 1 1/2 months [1]:
net/batman-adv/bridge_loop_avoidance.c | 35 +++--------------------- net/batman-adv/routing.c | 19 ++----------- net/batman-adv/translation-table.c | 24 ++-------------- net/batman-adv/types.h | 2 - 4 files changed, 12 insertions(+), 68 deletions(-)
The patches which are currently missing in net-next are:
2decb5f1fef1484f1b7319aaf2f36b5492d8d943 4a73d7438dfb60c7ac82758875292bc14f363b45 2dd1d9f06ac1208b1921aa90d479c3940bc70b4f b307e72d119f0ca5cf3c00d05d62320975261ef4
All of them are from maint and thus have conflicts with patches that are already in net-next. The rebased/squashed patches can be found in the attachments.
Kind regards, Sven
[1] https://lists.open-mesh.org/pipermail/linux-merge/2015-September/002582.html