From: Kalle Valo <kvalo@codeaurora.org>
To: Joe Perches <joe@perches.com>
Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: [PATCH 1/5] ti: Convert wl1271_<level> logging macros to dev_<level> or pr_<level>
Date: Tue, 26 Apr 2016 12:06:09 +0300 [thread overview]
Message-ID: <87d1pczqm6.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <760b583e96a9a88f06e97150617f791c3726a302.1457395071.git.joe@perches.com> (Joe Perches's message of "Mon, 7 Mar 2016 16:19:33 -0800")
Joe Perches <joe@perches.com> writes:
> Use the more common logging mechanism passing wl->dev where
> appropriate. Remove the macros. Add argument struct wl1271 *wl to
> some functions to make these logging mechanisms work.
>
> Miscellanea:
>
> o Coalesce formats, add required trailing \n to formats
> Some formats already had previously incorrect \n uses
> o Realign arguments
> o Correct a couple typos and grammar defects
> o Split a multiple line error message to multiple calls of dev_err
> o Add #define pr_fmt when pr_<level> is used
> o Remove unnecessary/duplicate pr_fmt use from wl1271_debug macro
>
> Signed-off-by: Joe Perches <joe@perches.com>
Doesn't apply anymore:
Applying: ti: Convert wl1271_<level> logging macros to dev_<level> or pr_<level>
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ti/wlcore/wlcore_i.h
Auto-merging drivers/net/wireless/ti/wlcore/tx.c
Auto-merging drivers/net/wireless/ti/wlcore/scan.c
Auto-merging drivers/net/wireless/ti/wlcore/rx.c
Auto-merging drivers/net/wireless/ti/wlcore/ps.c
Auto-merging drivers/net/wireless/ti/wlcore/main.c
Auto-merging drivers/net/wireless/ti/wlcore/cmd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ti/wlcore/cmd.c
Auto-merging drivers/net/wireless/ti/wl18xx/tx.c
Auto-merging drivers/net/wireless/ti/wl18xx/scan.c
Auto-merging drivers/net/wireless/ti/wl18xx/main.c
Auto-merging drivers/net/wireless/ti/wl18xx/event.c
Auto-merging drivers/net/wireless/ti/wl18xx/debugfs.c
Auto-merging drivers/net/wireless/ti/wl18xx/cmd.c
Auto-merging drivers/net/wireless/ti/wl12xx/scan.c
Auto-merging drivers/net/wireless/ti/wl12xx/main.c
Failed to merge in the changes.
--
Kalle Valo
next prev parent reply other threads:[~2016-04-26 9:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-08 0:19 [PATCH 0/5] wireless: ti: Convert specialized logging macros to kernel style Joe Perches
2016-03-08 0:19 ` [PATCH 1/5] ti: Convert wl1271_<level> logging macros to dev_<level> or pr_<level> Joe Perches
2016-04-26 9:06 ` Kalle Valo [this message]
2016-03-08 0:19 ` [PATCH 2/5] ti: wl1251: Convert wl1251_error to wiphy_err/pr_err Joe Perches
2016-03-08 0:19 ` [PATCH 3/5] ti: wl1251: Convert wl1251_warning to wiphy_warn Joe Perches
2016-03-08 0:19 ` [PATCH 4/5] ti: wl1251: Convert wl1251_notice to wiphy_info/pr_info Joe Perches
2016-03-08 0:19 ` [PATCH 5/5] ti: wl1251: Convert wl1251_info to wl1251_debug Joe Perches
2016-03-30 11:51 ` [PATCH 0/5] wireless: ti: Convert specialized logging macros to kernel style Kalle Valo
2016-03-30 21:36 ` Joe Perches
2016-03-31 7:39 ` Kalle Valo
2016-03-31 8:07 ` Joe Perches
2016-03-31 8:59 ` Eliad Peller
2016-04-15 12:22 ` 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=87d1pczqm6.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=joe@perches.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).