From: Kalle Valo <kvalo@qca.qualcomm.com> To: Michal Kazior <michal.kazior@tieto.com> Cc: <ath10k@lists.infradead.org>, <linux-wireless@vger.kernel.org> Subject: Re: [PATCH 0/3] ath10k: fixes Date: Fri, 19 Jul 2013 14:43:28 +0300 [thread overview] Message-ID: <87wqom3hcv.fsf@kamboji.qca.qualcomm.com> (raw) In-Reply-To: <CA+BoTQna=a66_g+_WG8mnENEDEiUcAysa-joeP-xmTM+mYfY=Q@mail.gmail.com> (Michal Kazior's message of "Fri, 19 Jul 2013 13:10:52 +0200") Michal Kazior <michal.kazior@tieto.com> writes: > On 19 July 2013 13:07, Kalle Valo <kvalo@qca.qualcomm.com> wrote: >> Michal Kazior <michal.kazior@tieto.com> writes: >> >>> Hi, >>> >>> Here are some fixes for ath10k. The rts threshold >>> patch addresses my mistake in commit >>> 9aeb6fe53d1f0d6e58658484ce9ad7b59f0ef16b which >>> caused rts to be always enabled causing throughput >>> issues in some cases. >>> >>> >>> Michal Kazior (3): >>> ath10k: prevent HTC from being used after stopping >>> ath10k: fix memleak in mac setup >>> ath10k: fix rts/fragmentation threshold setup >> >> Doesn't apply: >> >> Applying: ath10k: prevent HTC from being used after stopping >> Applying: ath10k: fix memleak in mac setup >> Applying: ath10k: fix rts/fragmentation threshold setup >> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/mac.c). >> Repository lacks necessary blobs to fall back on 3-way merge. >> Cannot fall back to three-way merge. >> Patch failed at 0003 ath10k: fix rts/fragmentation threshold setup > > Eww. Sorry about that (I did warn you though). Perhaps that's because > you skipped one of the recovery patches that git is confused now. No worries. Most likely I could have fixed the conflict myself, but if 3-way merge doesn't work it's too much work. > I'll resend the whole patchset rebased and with the HTC patch fixed. Thanks. -- Kalle Valo
WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com> To: Michal Kazior <michal.kazior@tieto.com> Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Subject: Re: [PATCH 0/3] ath10k: fixes Date: Fri, 19 Jul 2013 14:43:28 +0300 [thread overview] Message-ID: <87wqom3hcv.fsf@kamboji.qca.qualcomm.com> (raw) In-Reply-To: <CA+BoTQna=a66_g+_WG8mnENEDEiUcAysa-joeP-xmTM+mYfY=Q@mail.gmail.com> (Michal Kazior's message of "Fri, 19 Jul 2013 13:10:52 +0200") Michal Kazior <michal.kazior@tieto.com> writes: > On 19 July 2013 13:07, Kalle Valo <kvalo@qca.qualcomm.com> wrote: >> Michal Kazior <michal.kazior@tieto.com> writes: >> >>> Hi, >>> >>> Here are some fixes for ath10k. The rts threshold >>> patch addresses my mistake in commit >>> 9aeb6fe53d1f0d6e58658484ce9ad7b59f0ef16b which >>> caused rts to be always enabled causing throughput >>> issues in some cases. >>> >>> >>> Michal Kazior (3): >>> ath10k: prevent HTC from being used after stopping >>> ath10k: fix memleak in mac setup >>> ath10k: fix rts/fragmentation threshold setup >> >> Doesn't apply: >> >> Applying: ath10k: prevent HTC from being used after stopping >> Applying: ath10k: fix memleak in mac setup >> Applying: ath10k: fix rts/fragmentation threshold setup >> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/mac.c). >> Repository lacks necessary blobs to fall back on 3-way merge. >> Cannot fall back to three-way merge. >> Patch failed at 0003 ath10k: fix rts/fragmentation threshold setup > > Eww. Sorry about that (I did warn you though). Perhaps that's because > you skipped one of the recovery patches that git is confused now. No worries. Most likely I could have fixed the conflict myself, but if 3-way merge doesn't work it's too much work. > I'll resend the whole patchset rebased and with the HTC patch fixed. Thanks. -- Kalle Valo _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2013-07-19 11:43 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-07-18 6:33 [PATCH 0/3] ath10k: fixes Michal Kazior 2013-07-18 6:33 ` Michal Kazior 2013-07-18 6:33 ` [PATCH 1/3] ath10k: prevent HTC from being used after stopping Michal Kazior 2013-07-18 6:33 ` Michal Kazior 2013-07-19 11:04 ` Kalle Valo 2013-07-19 11:04 ` Kalle Valo 2013-07-19 11:08 ` Michal Kazior 2013-07-19 11:08 ` Michal Kazior 2013-07-19 11:44 ` Kalle Valo 2013-07-19 11:44 ` Kalle Valo 2013-07-18 6:33 ` [PATCH 2/3] ath10k: fix memleak in mac setup Michal Kazior 2013-07-18 6:33 ` Michal Kazior 2013-07-18 6:33 ` [PATCH 3/3] ath10k: fix rts/fragmentation threshold setup Michal Kazior 2013-07-18 6:33 ` Michal Kazior 2013-07-19 11:07 ` [PATCH 0/3] ath10k: fixes Kalle Valo 2013-07-19 11:07 ` Kalle Valo 2013-07-19 11:10 ` Michal Kazior 2013-07-19 11:10 ` Michal Kazior 2013-07-19 11:43 ` Kalle Valo [this message] 2013-07-19 11:43 ` Kalle Valo 2013-07-22 12:13 ` [PATCH v2 0/4] " Michal Kazior 2013-07-22 12:13 ` Michal Kazior 2013-07-22 12:13 ` [PATCH v2 1/4] ath10k: prevent HTC from being used after stopping Michal Kazior 2013-07-22 12:13 ` Michal Kazior 2013-07-22 12:13 ` [PATCH v2 2/4] ath10k: don't reset HTC endpoints unnecessarily Michal Kazior 2013-07-22 12:13 ` Michal Kazior 2013-07-23 8:46 ` Kalle Valo 2013-07-23 8:46 ` Kalle Valo 2013-07-22 12:13 ` [PATCH v2 3/4] ath10k: fix memleak in mac setup Michal Kazior 2013-07-22 12:13 ` Michal Kazior 2013-07-22 12:13 ` [PATCH v2 4/4] ath10k: fix rts/fragmentation threshold setup Michal Kazior 2013-07-22 12:13 ` Michal Kazior 2013-07-23 8:47 ` [PATCH v2 0/4] ath10k: fixes Kalle Valo 2013-07-23 8:47 ` Kalle Valo -- strict thread matches above, loose matches on Subject: below -- 2013-08-21 6:34 [PATCH 0/3] " Michal Kazior 2013-08-21 6:34 ` Michal Kazior 2013-08-22 10:05 ` Michal Kazior 2013-08-22 10:05 ` Michal Kazior 2013-05-27 9:25 [PATCH 0/3] ath10k fixes Sujith Manoharan
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=87wqom3hcv.fsf@kamboji.qca.qualcomm.com \ --to=kvalo@qca.qualcomm.com \ --cc=ath10k@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ --cc=michal.kazior@tieto.com \ /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: linkBe 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.