Hi,
I wanted to give some additional files that should help to make the revert a little bit easier.
revert-patches.tar.xz contains the separated revert-commit that produced the complete revert "batman-adv: Revert Distributed ARP Table"... so just in case somebody needs them.
readd_patches.tar.xz contains the patches that Antonio can use to create a new branch for dat based on batman-adv.git:next (applying the patch "batman-adv: Revert Distributed ARP Table" and then all patches in this tarball will create the same files as we have now in ccf1183f53baa879cd5a808dbb904f6053fa40f3)
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
This is also the patch that ordex has to check to find out whether he has all things added after rebasing dat in the master branch (for example the counting added by Martin is not obvious). When he applies it on top of his branch and is back to the same state as without his patches... he should at least have all changes added again.
Kind regards, Sven