Hi Stephen,
On Fri, Apr 19, 2013 at 01:21:27PM +1000, Stephen Rothwell wrote:
Caused by commits 612d2b4fe0a1 ("batman-adv: network coding - save overheard and tx packets for decoding") and 2df5278b0267 ("batman-adv: network coding - receive coded packets and decode them") from the net-next tree interacting with commit fe8a93b95145 ("batman-adv: make is_my_mac() check for the current mesh only") from the net tree.
I added the following merge fix patch and can carry it as necessary:
thank you very much for taking care of this. However, as I wrote to David in the pull request which generated this noise (http://patchwork.ozlabs.org/patch/237363/), I am now going to send a second pull request which fixes this problem properly and adds the related kernel doc.
Your patch looks good, but I'd prefer to send my already prepared pull request.
Is it ok with you?
Cheers,
Hi Antonio,
On Fri, 19 Apr 2013 09:34:09 +0200 Antonio Quartulli ordex@autistici.org wrote:
Your patch looks good, but I'd prefer to send my already prepared pull request.
Is it ok with you?
Its entirely up to Dave how/if he fixes this up. He could just leave it to Linus, though he would usually pull the net tree into the net-next tree after Linus merges the net tree - in which case, this should be fixed in that merge.
i.e. ask Dave :-)
b.a.t.m.a.n@lists.open-mesh.org
-
Antonio Quartulli -
Stephen Rothwell