From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Berg <johannes@sipsolutions.net>
Subject: Re: merge net into net-next?
Date: Thu, 08 Jun 2017 14:14:15 +0200
Message-ID: <1496924055.26119.1.camel@sipsolutions.net>
References: <1496923855.26119.0.camel@sipsolutions.net>
         (sfid-20170608_141147_504220_6BBE7F06)
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Cc: netdev <netdev@vger.kernel.org>
To: David Miller <davem@davemloft.net>
Return-path: <netdev-owner@vger.kernel.org>
Received: from s3.sipsolutions.net ([5.9.151.49]:41710 "EHLO sipsolutions.net"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750788AbdFHMOS (ORCPT <rfc822;netdev@vger.kernel.org>);
        Thu, 8 Jun 2017 08:14:18 -0400
In-Reply-To: <1496923855.26119.0.camel@sipsolutions.net> (sfid-20170608_141147_504220_6BBE7F06)
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

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!

johannes