From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <linux-wireless-owner@vger.kernel.org>
Received: from s3.sipsolutions.net ([5.9.151.49]:33775 "EHLO sipsolutions.net"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751660AbcJCKHE (ORCPT <rfc822;linux-wireless@vger.kernel.org>);
        Mon, 3 Oct 2016 06:07:04 -0400
Message-ID: <1475489220.5817.0.camel@sipsolutions.net> (sfid-20161003_120713_950456_C04FA3D8)
Subject: Re: pull-request: mac80211-next 2016-09-30
From: Johannes Berg <johannes@sipsolutions.net>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Date: Mon, 03 Oct 2016 12:07:00 +0200
In-Reply-To: <20161003.015401.1915647209236695770.davem@davemloft.net>
References: <1475252077-6165-1-git-send-email-johannes@sipsolutions.net>
         <20161003.015401.1915647209236695770.davem@davemloft.net>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Sender: linux-wireless-owner@vger.kernel.org
List-ID: <linux-wireless.vger.kernel.org>

On Mon, 2016-10-03 at 01:54 -0400, David Miller wrote:
> 
> Could you please look into this and send me a new pull request with
> the conflicts resolved?
> 

Sure, will do (tomorrow, we have a holiday today).

Would you prefer I send you the merge resolution for your tree, or just
pull in net for a new pull request?

johannes