From: Kalle Valo <kv...@codeaurora.org>
Date: Tue,  4 Aug 2020 11:14:33 +0000 (UTC)

> wireless-drivers-next patches for v5.9
> 
> Second set of patches for v5.9. mt76 has most of patches this time.
> Otherwise it's just smaller fixes and cleanups to other drivers.
> 
> There was a major conflict in mt76 driver between wireless-drivers and
> wireless-drivers-next. I solved that by merging the former to the
> latter.
 ...

Pulled, thanks Kalle.

I don't know how I missed the conflict resolution guide in your previous
pull request.  I was sure I scanned it for such info several times :-/

Thanks again!

Reply via email to