[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5770860D.8040607@lwfinger.net>
Date: Sun, 26 Jun 2016 20:49:01 -0500
From: Larry Finger <Larry.Finger@...inger.net>
To: Joe Perches <joe@...ches.com>,
Chaoming Li <chaoming_li@...lsil.com.cn>
Cc: Kalle Valo <kvalo@...eaurora.org>, linux-wireless@...r.kernel.org,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] rtlwifi: Add missing newlines to RT_TRACE calls
On 06/26/2016 08:26 PM, Joe Perches wrote:
> On Sun, 2016-06-26 at 18:13 -0700, Joe Perches wrote:
>> On Sun, 2016-06-26 at 19:18 -0500, Larry Finger wrote:
>>>
>>> On 06/26/2016 02:34 PM, Joe Perches wrote:
>>>>
>>>>
>>>> RT_TRACE does not add a newline to the end of a message and always
>>>> emits at KERN_DEBUG so these are susceptible to message
>>>> interleaving
>>>> from other processes without the newline.
>>>>
>>>> Signed-off-by: Joe Perches <joe@...ches.com>
>>>> ---
>>> This patch does not apply to the wireless-drivers-next repo. Which
>>> one
>>> did you use?
>> linux-next
>
> btw: both patches seem to apply to wireless-drivers-next just fine.
>
> $ git rev-parse HEAD
> 1bb57c8a5e33bcbec031ce0c629968922d5af89d
> $ git am ../next/0001-rtlwifi-Create-_rtl_dbg_trace-function-to-reduce-RT_.patch
> Applying: rtlwifi: Create _rtl_dbg_trace function to reduce RT_TRACE code size
> $ git am ../next/0001-rtlwifi-Add-missing-newlines-to-RT_TRACE-calls.patch
> Applying: rtlwifi: Add missing newlines to RT_TRACE calls
The conflict is with the set of 10 patches I sent out yesterday. As I have to
update them anyway, I will apply yours first, then do mine. That should resolve
the problem.
Larry
Powered by blists - more mailing lists