Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752780AbcDFSjQ (ORCPT ); Wed, 6 Apr 2016 14:39:16 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:33346 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751678AbcDFSjP (ORCPT ); Wed, 6 Apr 2016 14:39:15 -0400 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: rtlwifi: btcoexist: Convert BTC_PRINTK to btc__dbg From: Kalle Valo In-Reply-To: <4672f9efb37df545ae504d51ca626bf34237fa63.1458258337.git.joe@perches.com> To: Joe Perches Cc: linux-kernel@vger.kernel.org, Larry Finger , Chaoming Li , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Message-Id: <20160406183913.BE8E8615EF@smtp.codeaurora.org> Date: Wed, 6 Apr 2016 18:39:13 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 849 Lines: 24 > Use a more common logging style. > > Miscellanea: > > o Add specific logging macros for ALGORITHM and INTERFACE types > o Output the messages at KERN_DEBUG > o Coalesce formats > o Align arguments > o Whitespace style adjustments for only these changes > > Signed-off-by: Joe Perches Thanks, applied to wireless-drivers-next.git. There were some conflicts but 3-way merge was able to fix them. Please double check still. Applying: rtlwifi: btcoexist: Convert BTC_PRINTK to btc__dbg Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h Auto-merging drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c Auto-merging drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c Kalle Valo