From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Aarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Cc: <ath6kl-devel@qualcomm.com>,
linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH] ath6kl: Fix merge error
Date: Mon, 12 Mar 2012 10:00:01 +0200 [thread overview]
Message-ID: <4F5DAD01.9020008@qca.qualcomm.com> (raw)
In-Reply-To: <1331238302-4813-1-git-send-email-aarthi.thiruvengadam@qca.qualcomm.com>
On 03/08/2012 10:25 PM, Aarthi Thiruvengadam wrote:
> Portion of the commit id 080eec4fb4 was overwritten by mistake due to a merge
> conflict. This patch fixes the code back to how it should be.
>
> Signed-off-by: Aarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Thanks for catching this! I have applied the patch but did some changes
to the commit log:
commit 17a7b16df4ba8e71e149fcf31e0b639ff45ddf84
Author: Aarthi Thiruvengadam <aarthi.thiruvengadam@qca.qualcomm.com>
Date: Thu Mar 8 12:25:02 2012 -0800
ath6kl: Fix merge error in ath6kl_set_ies()
Portion of the commit id 080eec4fb4 ("ath6kl: Clear the IE in firmware
if not set") was overwritten by mistake due to a merge
conflict. This patch fixes the code back to how it should be.
kvalo: more details to the commit log
Signed-off-by: Aarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Kalle
parent reply other threads:[~2012-03-12 8:00 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <1331238302-4813-1-git-send-email-aarthi.thiruvengadam@qca.qualcomm.com>]
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=4F5DAD01.9020008@qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath6kl-devel@qualcomm.com \
--cc=athiruve@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).