From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:35414 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1033711AbeCASG2 (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 1 Mar 2018 13:06:28 -0500
Date: Thu, 01 Mar 2018 13:06:08 -0500 (EST)
Message-Id: <20180301.130608.1315053433159226013.davem@davemloft.net>
To: brouer@redhat.com
Cc: alexei.starovoitov@gmail.com, borkmann@iogearbox.net,
        netdev@vger.kernel.org
Subject: Re: When is net fixes getting merged into net-next and bpf-next
From: David Miller <davem@davemloft.net>
In-Reply-To: <20180301184557.439bbb7b@redhat.com>
References: <20180301184557.439bbb7b@redhat.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Jesper Dangaard Brouer <brouer@redhat.com>
Date: Thu, 1 Mar 2018 18:45:57 +0100

> Hi Maintainers,
> 
> I'm working on a patchset based on bpf-next, but I'm starting to
> conflict with my own fixes patches that are only in the net git tree...

net got merged into net-next just last weekend

I only merge net into net-next when I send a pull request to Linus, he
takes it, and I can fast forward net.