From: Joe Perches <joe@perches.com>
To: Larry Finger <Larry.Finger@lwfinger.net>, linux-kernel@vger.kernel.org
Cc: Chaoming Li <chaoming_li@realsil.com.cn>,
Kalle Valo <kvalo@codeaurora.org>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH] rtlwifi: btcoexist: Convert BTC_PRINTK to btc_<foo>_dbg
Date: Thu, 17 Mar 2016 20:37:38 -0700 [thread overview]
Message-ID: <1458272258.9556.46.camel@perches.com> (raw)
In-Reply-To: <56EB6DD9.3000300@lwfinger.net>
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
next prev parent reply other threads:[~2016-03-18 3:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-18 0:00 [PATCH] rtlwifi: btcoexist: Convert BTC_PRINTK to btc_<foo>_dbg Joe Perches
2016-03-18 2:54 ` Larry Finger
2016-03-18 3:37 ` Joe Perches [this message]
2016-03-19 9:09 ` Kalle Valo
2016-03-19 9:09 ` Kalle Valo
2016-04-06 18:39 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458272258.9556.46.camel@perches.com \
--to=joe@perches.com \
--cc=Larry.Finger@lwfinger.net \
--cc=chaoming_li@realsil.com.cn \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.