From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: How to post rxrpc patches for net-next with deps on net?
Date: Wed, 03 Oct 2018 14:47:40 -0700 (PDT)
Message-ID: <20181003.144740.2213999958916677392.davem@davemloft.net>
References: <22012.1538598559@warthog.procyon.org.uk>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org
To: dhowells@redhat.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([23.128.96.9]:39276 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725799AbeJDEhv (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 4 Oct 2018 00:37:51 -0400
In-Reply-To: <22012.1538598559@warthog.procyon.org.uk>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: David Howells <dhowells@redhat.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.