Re: [PATCH 0/2 net] Bug fixes for batman-adv 2012-06-23

From: Antonio Quartulli <redacted>
Date: Sat, 23 Jun 2012 17:45:12 +0200

after pulling these patchset in net, you should hit a conflict while trying to
merge net into net-next. The conflict is caused by the renaming patches that you
already have in the next tree.

Here are our instructions about how to solve it. Hope they will help.

Thanks a lot for this.