netdev - Re: batman-adv merge-conflict

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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130422.204024.29103974581251401.davem@davemloft.net>
Date:	Mon, 22 Apr 2013 20:40:24 -0400 (EDT)
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: batman-adv merge-conflict

From: Antonio Quartulli <ordex@...istici.org>
Date: Fri, 19 Apr 2013 10:26:51 +0200

> here are the instructions to resolve the conflicts you will get
> while merging net into net-next.

Thanks.

> I'm now going to send a pull request to fix some compile issues
> generated by the merge.

We never fix such breakage separately.

We put these kinds of things in the merge commit, so proper bisecting
is possible over the merge.  And that's what I did just now.

--
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