From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from s3.sipsolutions.net ([5.9.151.49]:40540 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751834AbbAPHgW (ORCPT ); Fri, 16 Jan 2015 02:36:22 -0500 Message-ID: <1421393778.2388.0.camel@sipsolutions.net> (sfid-20150116_083630_438711_98511A87) Subject: Re: pull-request: mac80211-next 2015-01-15 From: Johannes Berg To: David Miller Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org Date: Fri, 16 Jan 2015 08:36:18 +0100 In-Reply-To: <20150115.192820.2095761147762961625.davem@davemloft.net> References: <1421325902.1962.8.camel@sipsolutions.net> <20150115.192820.2095761147762961625.davem@davemloft.net> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thu, 2015-01-15 at 19:28 -0500, David Miller wrote: > I had to resolve a minor merge conflict, please take a look to make sure > I got it right. Ah, yes, sorry about that - I knew about the conflict (had resolved it numerous times) but forgot to give you a heads-up. What you did is good, thanks. johannes From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Berg Subject: Re: pull-request: mac80211-next 2015-01-15 Date: Fri, 16 Jan 2015 08:36:18 +0100 Message-ID: <1421393778.2388.0.camel@sipsolutions.net> References: <1421325902.1962.8.camel@sipsolutions.net> <20150115.192820.2095761147762961625.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: David Miller Return-path: In-Reply-To: <20150115.192820.2095761147762961625.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org On Thu, 2015-01-15 at 19:28 -0500, David Miller wrote: > I had to resolve a minor merge conflict, please take a look to make sure > I got it right. Ah, yes, sorry about that - I knew about the conflict (had resolved it numerous times) but forgot to give you a heads-up. What you did is good, thanks. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html