netdev - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20181004.033603.80798676270756244.davem@davemloft.net>
Date:   Thu, 04 Oct 2018 03:36:03 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     dhowells@...hat.com
Cc:     netdev@...r.kernel.org
Subject: Re: How to post rxrpc patches for net-next with deps on net?

From: David Miller <davem@...emloft.net>
Date: Wed, 03 Oct 2018 14:47:40 -0700 (PDT)

> From: David Howells <dhowells@...hat.com>
> Date: Wed, 03 Oct 2018 21:29:19 +0100
> 
>> 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.
> 
> The best way to make me aware of the dependency, and wait for net to get merged
> into net-next.
> 
> I plan to do either this evening or some time tomorrow afternoon.

Just FYI, net has been merged into net-next.