From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Luca Coelho <luca@coelho.fi>,
Wireless <linux-wireless@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Johannes Berg <johannes.berg@intel.com>
Subject: Re: linux-next: build warning after merge of the wireless-drivers-next tree
Date: Fri, 1 Feb 2019 07:52:09 +1100 [thread overview]
Message-ID: <20190201075209.1a91a472@canb.auug.org.au> (raw)
In-Reply-To: <875zu5j5yc.fsf@kamboji.qca.qualcomm.com>
[-- Attachment #1: Type: text/plain, Size: 729 bytes --]
Hi all,
On Thu, 31 Jan 2019 15:46:03 +0200 Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Luca Coelho <luca@coelho.fi> writes:
>
> >
> > This was a conflict resolution damage in one of the patches I applied.
> > We already have a fix for it[1] and Kalle will apply it to wireless-
> > drivers-next soon.
> >
> > Sorry for the trouble, but somehow I didn't see this warning and
> > kbuildbot also reported successful compilation with it. :(
> >
> > [1] https://patchwork.kernel.org/patch/10788503/
>
> I applied the fix now:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=3864be551405b582ae38fbcdfdbb6e49052f5f6d
Thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-01-31 20:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 23:46 linux-next: build warning after merge of the wireless-drivers-next tree Stephen Rothwell
2019-01-30 23:51 ` Luca Coelho
[not found] ` <9455f1b9e746f2c28d1573ccdce3836ece42cd8a.camel-XPOmlcxoEMv1KXRcyAk9cg@public.gmane.org>
2019-01-31 13:46 ` Kalle Valo
2019-01-31 20:52 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-24 2:16 Stephen Rothwell
2021-06-24 5:49 ` Kalle Valo
2017-01-13 0:12 Stephen Rothwell
2017-01-13 13:47 ` Kalle Valo
2017-01-17 11:49 ` Kalle Valo
2016-11-28 0:58 Stephen Rothwell
2016-11-28 7:25 ` Kalle Valo
2016-11-28 8:16 ` Barry Day
2016-11-28 11:44 ` Kalle Valo
2016-11-28 12:26 ` Jes Sorensen
2016-07-20 2:25 Stephen Rothwell
2016-07-20 6:18 ` Reizer, Eyal
[not found] ` <8665E2433BC68541A24DFFCA87B70F5B3616184A-1tpBd5JUCm6IQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2016-07-20 18:41 ` Kalle Valo
2016-07-08 1:32 Stephen Rothwell
2016-07-08 1:35 ` Stephen Rothwell
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=20190201075209.1a91a472@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=johannes.berg@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luca@coelho.fi \
/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).