All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: ath9k-devel@lists.ath9k.org
Subject: [ath9k-devel] [PATCH 2/2] ath10k: Neaten ath10k_<level> uses
Date: Sat, 1 Jun 2013 12:19:34 +0300	[thread overview]
Message-ID: <87hahi193t.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1368687924.2194.51.camel@joe-AO722> (Joe Perches's message of "Thu, 16 May 2013 00:05:24 -0700")

Joe Perches <joe@perches.com> writes:

> Standardize the logging messages a bit.
>
> A couple of typos were fixed.
> Standardize the use of "VDEV:%d" instead of mixing in some "VDEV: %d".
>
> Signed-off-by: Joe Perches <joe@perches.com>

Thanks. I decided to drop patch 1 based on earlier discussion, but with
patch 2 I got quite a few conflicts. I almost applied it partially but
then realised that would make work for you when rebasing.

patching file drivers/net/wireless/ath/ath10k/mac.c
Hunk #1 succeeded at 415 (offset -13 lines).
Hunk #2 succeeded at 439 (offset -13 lines).
Hunk #3 succeeded at 478 (offset -13 lines).
Hunk #4 succeeded at 545 (offset -13 lines).
Hunk #5 succeeded at 556 (offset -13 lines).
Hunk #6 FAILED at 629.
Hunk #7 succeeded at 632 (offset -13 lines).
Hunk #8 succeeded at 641 (offset -13 lines).
Hunk #9 succeeded at 653 (offset -13 lines).
Hunk #10 succeeded at 662 (offset -13 lines).
Hunk #11 succeeded at 690 (offset -13 lines).
Hunk #12 FAILED at 716.
Hunk #13 succeeded at 1081 (offset 18 lines).
Hunk #14 succeeded at 1089 (offset 18 lines).
Hunk #15 FAILED at 1081.
Hunk #16 FAILED at 1106.
Hunk #17 FAILED at 1117.
Hunk #18 succeeded at 1406 (offset 43 lines).
Hunk #19 succeeded at 1763 (offset 55 lines).
Hunk #20 succeeded at 1818 (offset 55 lines).
Hunk #21 succeeded at 1840 (offset 55 lines).
Hunk #22 succeeded at 1881 (offset 55 lines).
Hunk #23 FAILED at 1874.
Hunk #24 FAILED at 1909.
Hunk #25 FAILED at 1921.
Hunk #26 FAILED at 1936.
Hunk #27 FAILED at 1956.
Hunk #28 FAILED at 1974.
Hunk #29 FAILED at 2003.
Hunk #30 FAILED at 2022.
Hunk #31 FAILED at 2040.
Hunk #32 FAILED at 2229.
Hunk #33 FAILED at 2241.
Hunk #34 succeeded at 2327 with fuzz 1 (offset 69 lines).
Hunk #35 succeeded at 2342 with fuzz 1 (offset 70 lines).
Hunk #36 FAILED at 2492.
Hunk #37 FAILED at 2532.
Hunk #38 succeeded at 2920 (offset 96 lines).
Hunk #39 succeeded at 3033 (offset 101 lines).
18 out of 39 hunks FAILED -- saving rejects to file drivers/net/wireless/ath/ath10k/mac.c.rej

-- 
Kalle Valo

      reply	other threads:[~2013-06-01  9:19 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-15 14:42 [PATCH 00/29] ath10k: mac80211 driver for Qualcomm Atheros qca988x devices Kalle Valo
2013-05-15 14:42 ` [PATCH 01/29] ath10k: add bmi.c Kalle Valo
2013-05-15 14:42 ` [PATCH 02/29] ath10k: add bmi.h Kalle Valo
2013-05-15 15:01   ` Johannes Berg
2013-05-15 15:17     ` Kalle Valo
2013-05-15 14:43 ` [PATCH 03/29] ath10k: add ce.c Kalle Valo
2013-05-15 14:43 ` [PATCH 04/29] ath10k: add ce.h Kalle Valo
2013-05-15 14:43 ` [PATCH 05/29] ath10k: add core.c Kalle Valo
2013-05-15 14:43 ` [PATCH 06/29] ath10k: add core.h Kalle Valo
2013-05-15 14:43 ` [PATCH 07/29] ath10k: add debug.c Kalle Valo
2013-05-15 14:43 ` [PATCH 08/29] ath10k: add debug.h Kalle Valo
2013-05-15 14:43 ` [PATCH 09/29] ath10k: add hif.h Kalle Valo
2013-05-15 14:44 ` [PATCH 10/29] ath10k: add htc.c Kalle Valo
2013-05-15 14:44 ` [PATCH 11/29] ath10k: add htc.h Kalle Valo
2013-05-15 14:44 ` [PATCH 12/29] ath10k: add htt.c Kalle Valo
2013-05-15 14:44 ` [PATCH 13/29] ath10k: add htt.h Kalle Valo
2013-05-15 14:44 ` [PATCH 14/29] ath10k: add htt_rx.c Kalle Valo
2013-05-15 14:44 ` [PATCH 15/29] ath10k: add htt_tx.c Kalle Valo
2013-05-15 14:45 ` [PATCH 16/29] ath10k: add hw.h Kalle Valo
2013-05-15 14:45 ` [PATCH 17/29] ath10k: add mac.c Kalle Valo
2013-05-15 14:45 ` [PATCH 18/29] ath10k: add mac.h Kalle Valo
2013-05-15 14:45 ` [PATCH 19/29] ath10k: add pci.c Kalle Valo
2013-05-15 14:45 ` [PATCH 20/29] ath10k: add pci.h Kalle Valo
2013-05-15 14:45 ` [PATCH 21/29] ath10k: add rx_desc.h Kalle Valo
2013-05-15 14:45 ` [PATCH 22/29] ath10k: add targaddrs.h Kalle Valo
2013-05-15 14:46 ` [PATCH 23/29] ath10k: add trace.c Kalle Valo
2013-05-15 14:46 ` [PATCH 24/29] ath10k: add trace.h Kalle Valo
2013-05-15 14:46 ` [PATCH 25/29] ath10k: add txrx.c Kalle Valo
2013-05-15 14:46 ` [PATCH 26/29] ath10k: add txrx.h Kalle Valo
2013-05-15 14:46 ` [PATCH 27/29] ath10k: add wmi.c Kalle Valo
2013-05-15 14:46 ` [PATCH 28/29] ath10k: add wmi.h Kalle Valo
2013-05-15 14:46 ` [PATCH 29/29] ath10k: add Kconfig and Makefile Kalle Valo
2013-05-15 15:52 ` [PATCH 00/29] ath10k: mac80211 driver for Qualcomm Atheros qca988x devices Joe Perches
2013-05-15 15:54   ` Sujith Manoharan
2013-05-15 16:08     ` Kalle Valo
2013-05-15 16:22       ` Kalle Valo
     [not found] ` <1368639816.2194.9.camel@joe-AO722>
     [not found]   ` <8761yknn7i.fsf@kamboji.qca.qualcomm.com>
2013-05-16  7:03     ` [ath9k-devel] [PATCH 1/2] ath10k: Convert ath10k_dbg uses Joe Perches
2013-05-16  8:25       ` Michal Kazior
2013-05-20  7:12         ` Kalle Valo
2013-05-20 16:01           ` Joe Perches
2013-05-20 18:43             ` Kalle Valo
2013-05-16  7:05     ` [ath9k-devel] [PATCH 2/2] ath10k: Neaten ath10k_<level> uses Joe Perches
2013-06-01  9:19       ` Kalle Valo [this message]

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=87hahi193t.fsf@kamboji.qca.qualcomm.com \
    --to=kvalo@qca.qualcomm.com \
    --cc=ath9k-devel@lists.ath9k.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.