From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Berg <johannes@sipsolutions.net>
Subject: Re: pull-request: mac80211-next 2016-02-26
Date: Wed, 02 Mar 2016 00:16:26 +0100
Message-ID: <1456874186.7678.0.camel@sipsolutions.net>
References: <1456519067-8175-1-git-send-email-johannes@sipsolutions.net>
	 <20160301.171110.1945667051881874679.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: netdev@vger.kernel.org, linux-wireless@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]:39088 "EHLO sipsolutions.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751139AbcCAXQc (ORCPT <rfc822;netdev@vger.kernel.org>);
	Tue, 1 Mar 2016 18:16:32 -0500
In-Reply-To: <20160301.171110.1945667051881874679.davem@davemloft.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On Tue, 2016-03-01 at 17:11 -0500, David Miller wrote:
>=C2=A0
> There was a minor merge conflict with net/mac80211/debugfs.c, take
> a look and send me any fixups necessary.
>=20

Ah yes, I'd wondered when that change was coming in, but missed that
you had it in net-next now.

Looks good, thanks!

johannes