From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kalle Valo Date: Sat, 1 Jun 2013 12:19:34 +0300 Subject: [ath9k-devel] [PATCH 2/2] ath10k: Neaten ath10k_ uses In-Reply-To: <1368687924.2194.51.camel@joe-AO722> (Joe Perches's message of "Thu, 16 May 2013 00:05:24 -0700") References: <20130515143356.4492.43033.stgit@localhost6.localdomain6> <1368639816.2194.9.camel@joe-AO722> <8761yknn7i.fsf@kamboji.qca.qualcomm.com> <1368687924.2194.51.camel@joe-AO722> Message-ID: <87hahi193t.fsf@kamboji.qca.qualcomm.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org Joe Perches 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 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