| commit | d0e99511834b6828c960e978d9a8cb6e5731250d | [log] [tgz] |
|---|---|---|
| author | Kalle Valo <kvalo@kernel.org> | Tue Jan 17 13:36:25 2023 +0200 |
| committer | Kalle Valo <kvalo@kernel.org> | Tue Jan 17 13:36:25 2023 +0200 |
| tree | e7b062c1f9d28a55083477a1462286a7923a57fd | |
| parent | de7d0ff301fccc75281d7d8eb98c4a47faacf32d [diff] | |
| parent | 80f8a66dede0a4b4e9e846765a97809c6fe49ce5 [diff] |
Merge wireless into wireless-next Due to the two cherry picked commits from wireless to wireless-next we have several conflicts in mt76. To avoid any bugs with conflicts merge wireless into wireless-next. 96f134dc1964 wifi: mt76: handle possible mt76_rx_token_consume failures fe13dad8992b wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails