netdev - How to post rxrpc patches for net-next with deps on net?

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: <22012.1538598559@warthog.procyon.org.uk>
Date:   Wed, 03 Oct 2018 21:29:19 +0100
From:   David Howells <dhowells@...hat.com>
To:     David Miller <davem@...emloft.net>
cc:     dhowells@...hat.com, netdev@...r.kernel.org
Subject: How to post rxrpc patches for net-next with deps on net?

Hi Dave,

I have some rxrpc patches to post for your net-next/master branch, but there's
a dependency in them on the rxrpc-fixes-20180928 tag you pulled into your
net/master branch.

What's the best way to handle this?

 (1) Wait for you to merge net into net-next?

 (2) Base it on my own merge of rxrpc-fixes-20180928 into net-next?  I had to
     fix up drivers/net/ethernet/netronome/nfp/nfp_net_common.c in the merge
     I'm currently using.

 (3) Let you fix up the discrepency between the two branches?  Two lines that
     got removed in the rxrpc-fixes-20180928 tag cause a merge failure in
     net/rxrpc/conn_object.c when applying it to raw net-next by their
     unexpected presence.  It's nothing too bad.

Thanks,
David