[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1458272258.9556.46.camel@perches.com>
Date: Thu, 17 Mar 2016 20:37:38 -0700
From: Joe Perches <joe@...ches.com>
To: Larry Finger <Larry.Finger@...inger.net>,
linux-kernel@...r.kernel.org
Cc: Chaoming Li <chaoming_li@...lsil.com.cn>,
Kalle Valo <kvalo@...eaurora.org>,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH] rtlwifi: btcoexist: Convert BTC_PRINTK to btc_<foo>_dbg
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
Powered by blists - more mailing lists