Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbcCRDhr (ORCPT ); Thu, 17 Mar 2016 23:37:47 -0400 Received: from smtprelay0078.hostedemail.com ([216.40.44.78]:52602 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751271AbcCRDhm (ORCPT ); Thu, 17 Mar 2016 23:37:42 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::,RULES_HIT:41:355:379:541:599:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1538:1593:1594:1711:1714:1730:1747:1777:1792:2110:2393:2559:2562:2828:3138:3139:3140:3141:3142:3350:3622:3865:3870:3871:3872:3874:4321:5007:6261:10004:10400:10848:11232:11658:11914:12043:12050:12517:12519:12663:12740:13069:13071:13161:13229:13311:13357:13439:13894:14659:21060:21080:30054:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none X-HE-Tag: hole66_25ccdb06f040b X-Filterd-Recvd-Size: 1550 Message-ID: <1458272258.9556.46.camel@perches.com> Subject: Re: [PATCH] rtlwifi: btcoexist: Convert BTC_PRINTK to btc__dbg From: Joe Perches To: Larry Finger , linux-kernel@vger.kernel.org Cc: Chaoming Li , Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Date: Thu, 17 Mar 2016 20:37:38 -0700 In-Reply-To: <56EB6DD9.3000300@lwfinger.net> References: <4672f9efb37df545ae504d51ca626bf34237fa63.1458258337.git.joe@perches.com> <56EB6DD9.3000300@lwfinger.net> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1-1ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 564 Lines: 22 On Thu, 2016-03-17 at 21:54 -0500, Larry Finger wrote: > On 03/17/2016 07:00 PM, Joe Perches wrote: > > Use a more common logging style. [ 300K+ quote without comment ] > Joe, Hi Larry. > The patch looks good, but it has conflict in? > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c with the patch? > [PATCH 2/2] rtlwifi: btcoexist: Implement antenna selection that I submitted? > yesterday. No worries, it shouldn't be applied during the merge window anyway. The conflict is trivially resolved after the merge window is over. cheers, Joe