linux-kernel - Re: linux-next: manual merge of the net-next tree with the netfilter tree

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]

Date:   Sat, 12 Nov 2016 23:43:00 -0500 (EST)
From:   David Miller <davem@...emloft.net>
To:     pablo@...filter.org
Cc:     sfr@...b.auug.org.au, netdev@...r.kernel.org,
        netfilter-devel@...r.kernel.org, linux-next@...r.kernel.org,
        linux-kernel@...r.kernel.org, xiyou.wangcong@...il.com,
        johannes.berg@...el.com
Subject: Re: linux-next: manual merge of the net-next tree with the
 netfilter tree

From: Pablo Neira Ayuso <pablo@...filter.org>
Date: Thu, 10 Nov 2016 01:31:17 +0100

> I think I cannot help to address this conflict myself.
> 
> 8fbfef7f505b is in my nf tree, while 489111e5c25b is in net-next. So
> you will hit this conflict by when you pull net into net-next.
> 
> So please keep this patch from Stephen to resolve the conflict in your
> radar to solve this.

I will, thank you.