From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: merge net into net-next?
Date: Thu, 08 Jun 2017 10:19:52 -0400 (EDT)
Message-ID: <20170608.101952.1058268538534168493.davem@davemloft.net>
References: <1496923855.26119.0.camel@sipsolutions.net>
        <1496924055.26119.1.camel@sipsolutions.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org
To: johannes@sipsolutions.net
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:56726 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751774AbdFHOTx (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 8 Jun 2017 10:19:53 -0400
In-Reply-To: <1496924055.26119.1.camel@sipsolutions.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 08 Jun 2017 14:14:15 +0200

> On Thu, 2017-06-08 at 14:10 +0200, Johannes Berg wrote:
>> Hi Dave,
>> 
>> Could you do me a favour and merge net into net-next? I want to merge
>> that back in order to apply a patch to mac80211-next that otherwise
>> conflicts fairly badly with a change in mac80211.
> 
> Wait, forget it. You already did, I just managed to somehow miss that -
> sorry for the noise!

Great, nothing for me to do!