From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kalle Valo Date: Wed, 24 Apr 2013 13:35:41 +0300 Subject: [ath9k-devel] [PATCH v2 0/6] ath10k: cleanups 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") References: <87y5caj4bq.fsf@kamboji.qca.qualcomm.com> <1366704164-16590-1-git-send-email-michal.kazior@tieto.com> Message-ID: <87bo948bcy.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 Michal Kazior 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