From: Kalle Valo <kvalo@qca.qualcomm.com>
To: ath9k-devel@lists.ath9k.org
Subject: [ath9k-devel] [PATCH v2 0/6] ath10k: cleanups
Date: Wed, 24 Apr 2013 13:35:41 +0300 [thread overview]
Message-ID: <87bo948bcy.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1366704164-16590-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Tue, 23 Apr 2013 10:02:38 +0200")
Michal Kazior <michal.kazior@tieto.com> writes:
> Rebased on the tip of master branch.
>
> Michal Kazior (6):
> ath10k: rename htt_struct
> ath10k: fix code style
> ath10k: fix code style of handling errors
> ath10k: fix code style a little
> ath10k: cleanup tx/rx mode handling
> ath10k: cleanup hw init-related code
Thanks, applied. Patch 6 had conflicts, please check.
BTW, 3-way merge didn't work:
Applying: ath10k: cleanup hw init-related code
fatal: sha1 information is lacking or useless
(drivers/net/wireless/ath/ath10k/hw.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0006 ath10k: cleanup hw init-related code
Are you sure you don't have any custom patches as parent of the patchset
you are submitting? Or do you submit patches somehow differently?
The thing is that I really would like the patches have proper sha1
information. It makes my life so much easier.
--
Kalle Valo
next prev parent reply other threads:[~2013-04-24 10:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-19 9:35 [ath9k-devel] [PATCH 0/6] ath10k: cleanups Michal Kazior
2013-04-19 9:35 ` [ath9k-devel] [PATCH 1/6] ath10k: rename htt_struct Michal Kazior
2013-04-19 9:35 ` [ath9k-devel] [PATCH 2/6] ath10k: fix code style Michal Kazior
2013-04-19 9:35 ` [ath9k-devel] [PATCH 3/6] ath10k: fix code style of handling errors Michal Kazior
2013-04-19 9:35 ` [ath9k-devel] [PATCH 4/6] ath10k: fix code style a little Michal Kazior
2013-04-19 9:35 ` [ath9k-devel] [PATCH 5/6] ath10k: cleanup tx/rx mode handling Michal Kazior
2013-04-19 9:35 ` [ath9k-devel] [PATCH 6/6] ath10k: cleanup hw init-related code Michal Kazior
2013-04-22 9:35 ` [ath9k-devel] [PATCH 0/6] ath10k: cleanups Kalle Valo
2013-04-23 8:02 ` [ath9k-devel] [PATCH v2 " Michal Kazior
2013-04-23 8:02 ` [ath9k-devel] [PATCH v2 1/6] ath10k: rename htt_struct Michal Kazior
2013-04-23 8:02 ` [ath9k-devel] [PATCH v2 2/6] ath10k: fix code style Michal Kazior
2013-04-23 8:02 ` [ath9k-devel] [PATCH v2 3/6] ath10k: fix code style of handling errors Michal Kazior
2013-04-23 8:02 ` [ath9k-devel] [PATCH v2 4/6] ath10k: fix code style a little Michal Kazior
2013-04-23 8:02 ` [ath9k-devel] [PATCH v2 5/6] ath10k: cleanup tx/rx mode handling Michal Kazior
2013-04-23 8:02 ` [ath9k-devel] [PATCH v2 6/6] ath10k: cleanup hw init-related code Michal Kazior
2013-04-24 10:35 ` Kalle Valo [this message]
2013-04-24 10:56 ` [ath9k-devel] [PATCH v2 0/6] ath10k: cleanups Michal Kazior
2013-04-24 11:08 ` Kalle Valo
2013-04-24 11:00 ` 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=87bo948bcy.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.