All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@codeaurora.org>
To: Anilkumar Kolli <akolli@codeaurora.org>
Cc: ath11k@lists.infradead.org
Subject: Re: [PATCH] ath11k: clean up in qmi source files
Date: Wed,  8 May 2019 09:48:46 +0000 (UTC)	[thread overview]
Message-ID: <20190508094846.C1EF5609EF@smtp.codeaurora.org> (raw)
In-Reply-To: <1557154051-8682-1-git-send-email-akolli@codeaurora.org>

Anilkumar Kolli <akolli@codeaurora.org> wrote:

> Fix coding style, Remove unused variable.
> 
> Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>

Fails to apply, most likely due to my GCC warning patch. Please rebase.

Recorded preimage for 'drivers/net/wireless/ath/ath11k/qmi.c'
error: Failed to merge in the changes.
Applying: ath11k: clean up in qmi source files
Using index info to reconstruct a base tree...
M	drivers/net/wireless/ath/ath11k/qmi.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath11k/qmi.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath11k/qmi.c
Patch failed at 0001 ath11k: clean up in qmi source files
The copy of the patch that failed is found in: .git/rebase-apply/patch

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/patch/10931175/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


_______________________________________________
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

      reply	other threads:[~2019-05-08  9:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-06 14:47 [PATCH] ath11k: clean up in qmi source files Anilkumar Kolli
2019-05-08  9:48 ` Kalle Valo [this message]

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=20190508094846.C1EF5609EF@smtp.codeaurora.org \
    --to=kvalo@codeaurora.org \
    --cc=akolli@codeaurora.org \
    --cc=ath11k@lists.infradead.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.