netdev - Re: netfilter 00/29: Netfilter Update

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]

Date:	Thu, 27 Nov 2008 17:16:00 +0100
From:	Patrick McHardy <kaber@...sh.net>
To:	davem@...emloft.net
CC:	netdev@...r.kernel.org, netfilter-devel@...r.kernel.org
Subject: Re: netfilter 00/29: Netfilter Update

Patrick McHardy wrote:
> There's a trivial merge conflict in net/netfilter/nf_conntrack_netlink.c,
> so the patches won't apply directly. Please pull from
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

And for reference, this is what I did to resolve the conflict:


View attachment "conflict.diff" of type "text/x-patch" (1484 bytes)