Re: [B.A.T.M.A.N.] [PATCH] batman-adv: swap lines to get in sync with networking branch

On Wednesday, August 22, 2012 00:40:05 Antonio Quartulli wrote:

due to a merge conflict resolution handled differently in the networking branch, we now have a small divergence between our next branch and what we already have in net/batman-adv/ in the kernel. Since we cannot ask the kernel guys to "swap two lines", with this patch we fix the problem in our repo

Signed-off-by: Antonio Quartulli ordex@autistici.org

• this patch is for next

soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision 28d246e.

Thanks, Marek