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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20120623.232453.491199407189457113.davem@davemloft.net>
Date:	Sat, 23 Jun 2012 23:24:53 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	ordex@...istici.org
Cc:	netdev@...r.kernel.org, b.a.t.m.a.n@...ts.open-mesh.org
Subject: Re: [PATCH 0/2 net] Bug fixes for batman-adv 2012-06-23

From: Antonio Quartulli <ordex@...istici.org>
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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html