Return-path: Received: from s3.sipsolutions.net ([5.9.151.49]:45867 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754281AbaFWNE0 (ORCPT ); Mon, 23 Jun 2014 09:04:26 -0400 Message-ID: <1403528658.4418.28.camel@jlt4.sipsolutions.net> (sfid-20140623_152218_849817_BB22B521) Subject: Re: [PATCH v10 0/5] cfg/mac80211: implement multi-vif csa From: Johannes Berg To: Michal Kazior Cc: linux-wireless@vger.kernel.org, luca@coelho.fi Date: Mon, 23 Jun 2014 15:04:18 +0200 In-Reply-To: <1403009938-1084-1-git-send-email-michal.kazior@tieto.com> (sfid-20140617_150648_179364_3BB3732F) References: <1402577680-17888-1-git-send-email-michal.kazior@tieto.com> <1403009938-1084-1-git-send-email-michal.kazior@tieto.com> (sfid-20140617_150648_179364_3BB3732F) Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: There's also some merge conflict now, that was just in the context though and fairly easy to resolve. johannes