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 for Android: free password hash cracker in your pocket

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

Date:   Thu, 16 Aug 2018 02:08:51 +0200
From:   Pablo Neira Ayuso <pablo@...filter.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     NetFilter <netfilter-devel@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Matteo Croce <mcroce@...hat.com>, Julian Anastasov <ja@....bg>
Subject: Re: linux-next: manual merge of the net-next tree with the netfilter
 tree

On Thu, Aug 16, 2018 at 09:47:23AM +1000, Stephen Rothwell wrote:
> On Tue, 7 Aug 2018 12:49:32 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
[...]
> This is now a conflict between Linus' tree and the netfilter tree.

Will rebase nf.git here, so next pull request already deals with this
here to make it easier for upstream maintainers.

@Matteo, let me know if this is a problem in your case, you may have
references to the original commits in your backport queue probably.

Thanks for the heads up and sorry for the inconvenience.