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

Message-ID: <20130423044943.GG5732@ritirata.org>
Date:	Tue, 23 Apr 2013 06:49:43 +0200
From:	Antonio Quartulli <ordex@...istici.org>
To:	David Miller <davem@...emloft.net>
Cc:	netdev@...r.kernel.org, b.a.t.m.a.n@...ts.open-mesh.org
Subject: Re: batman-adv merge-conflict

On Mon, Apr 22, 2013 at 08:40:24PM -0400, David Miller wrote:
> 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.


Ok. Thanks a lot David!

Regards,

-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)