netdev

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

Message-ID: <11408.1539960053@warthog.procyon.org.uk>
Date:   Fri, 19 Oct 2018 15:40:53 +0100
From:   David Howells <dhowells@...hat.com>
To:     David Miller <davem@...emloft.net>
cc:     dhowells@...hat.com, netdev@...r.kernel.org,
        linux-afs@...ts.infradead.org
Subject: 

Hi Dave,

Is there going to be a merge of net into net-next before the merge window
opens?  Or do you have a sample merge that I can rebase my afs-next branch on?

The problem I have is that there's a really necessary patch in net that's not
in net-next:

	d7b4c24f45d2efe51b8f213da4593fefd49240ba
	rxrpc: Fix an uninitialised variable

(it fixes a fix that went in net just before you last merged it into
net-next).

So I would like to base my branch on both net and net-next, but the merge is
non-trivial, and I'd rather not hand Linus a merge that conflicts with yours.

The issues are:

 (*) net/sched/cls_api.c

     I think nlmsg_parse() needs to take both rtm_tca_policy and cb->extack as
     its last two arguments.  Each branch fills in one argument and leaves the
     other NULL.

 (*) net/ipv4/ipmr_base.c

     mr_rtm_dumproute() got a piece abstracted out and modified in one branch,
     but the unabstracted branch has a fix in the same area.  I think the
     thing to do is to apply the fix (removing the same two lines) from the
     abstracted-out branch.

Thanks,
David