From: Brian Norris <briannorris@chromium.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Kalle Valo <kvalo@qca.qualcomm.com>,
ath10k@lists.infradead.org, linux-wireless@vger.kernel.org,
govinds@codeaurora.org, Doug Anderson <dianders@chromium.org>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/4] ath10k: snoc: remove 'wcn3990' from generic resource handling
Date: Mon, 5 Nov 2018 13:17:00 -0800 [thread overview]
Message-ID: <CA+ASDXMz37pOFjeETM_xUQSBuLvki6G==v=RUO1T5G1t6Yv+dg@mail.gmail.com> (raw)
In-Reply-To: <20181105130403.93B6560600@smtp.codeaurora.org>
On Mon, Nov 5, 2018 at 5:04 AM Kalle Valo <kvalo@codeaurora.org> wrote:
> This patchset (I think it was with the first patch, but not sure) had some
> conflicts but 3-way merge was able to automatically solve them. Please check
> the end result anyway:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=77adda81e264e0c93af9570ac4ada82a5d0f5d99
I see the same. There were some unrelated changes to this file that
you merged to your pending tree in the meantime. The end result looks
fine to me. Thanks for the heads up.
Brian
WARNING: multiple messages have this Message-ID (diff)
From: Brian Norris <briannorris@chromium.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: govinds@codeaurora.org, linux-wireless@vger.kernel.org,
Doug Anderson <dianders@chromium.org>,
ath10k@lists.infradead.org,
Linux Kernel <linux-kernel@vger.kernel.org>,
Kalle Valo <kvalo@qca.qualcomm.com>
Subject: Re: [PATCH 1/4] ath10k: snoc: remove 'wcn3990' from generic resource handling
Date: Mon, 5 Nov 2018 13:17:00 -0800 [thread overview]
Message-ID: <CA+ASDXMz37pOFjeETM_xUQSBuLvki6G==v=RUO1T5G1t6Yv+dg@mail.gmail.com> (raw)
In-Reply-To: <20181105130403.93B6560600@smtp.codeaurora.org>
On Mon, Nov 5, 2018 at 5:04 AM Kalle Valo <kvalo@codeaurora.org> wrote:
> This patchset (I think it was with the first patch, but not sure) had some
> conflicts but 3-way merge was able to automatically solve them. Please check
> the end result anyway:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=77adda81e264e0c93af9570ac4ada82a5d0f5d99
I see the same. There were some unrelated changes to this file that
you merged to your pending tree in the meantime. The end result looks
fine to me. Thanks for the heads up.
Brian
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2018-11-05 21:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-13 0:55 [PATCH 1/4] ath10k: snoc: remove 'wcn3990' from generic resource handling Brian Norris
2018-10-13 0:55 ` Brian Norris
2018-10-13 0:55 ` [PATCH 2/4] ath10k: snoc: fix unabalanced regulator error handling Brian Norris
2018-10-13 0:55 ` Brian Norris
2018-10-18 17:54 ` Doug Anderson
2018-10-18 17:54 ` Doug Anderson
2018-10-24 22:10 ` Brian Norris
2018-10-24 22:10 ` Brian Norris
2018-10-13 0:55 ` [PATCH 3/4] ath10k: snoc: relax voltage requirements Brian Norris
2018-10-13 0:55 ` Brian Norris
2018-10-18 17:56 ` Doug Anderson
2018-10-18 17:56 ` Doug Anderson
2018-10-18 18:14 ` Brian Norris
2018-10-18 18:14 ` Brian Norris
2018-10-13 0:55 ` [PATCH 4/4] ath10k: snoc: fix unbalanced clock error handling Brian Norris
2018-10-13 0:55 ` Brian Norris
2018-10-16 23:53 ` Doug Anderson
2018-10-16 23:53 ` Doug Anderson
2018-11-06 16:14 ` Kalle Valo
2018-11-06 16:14 ` Kalle Valo
2018-10-16 23:43 ` [PATCH 1/4] ath10k: snoc: remove 'wcn3990' from generic resource handling Doug Anderson
2018-10-16 23:43 ` Doug Anderson
2018-10-16 23:47 ` Brian Norris
2018-10-16 23:47 ` Brian Norris
2018-11-05 13:04 ` Kalle Valo
2018-11-05 13:04 ` Kalle Valo
[not found] ` <20181105130403.93B6560600@smtp.codeaurora.org>
2018-11-05 21:17 ` Brian Norris [this message]
2018-11-05 21:17 ` Brian Norris
2018-11-06 16:18 ` Kalle Valo
2018-11-06 16:18 ` 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='CA+ASDXMz37pOFjeETM_xUQSBuLvki6G==v=RUO1T5G1t6Yv+dg@mail.gmail.com' \
--to=briannorris@chromium.org \
--cc=ath10k@lists.infradead.org \
--cc=dianders@chromium.org \
--cc=govinds@codeaurora.org \
--cc=kvalo@codeaurora.org \
--cc=kvalo@qca.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--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 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.