git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: de7d0ff 80f8a66)
Merge wireless into wireless-next
authorKalle Valo <kvalo@kernel.org>
Tue, 17 Jan 2023 11:36:25 +0000 (13:36 +0200)
committerKalle Valo <kvalo@kernel.org>
Tue, 17 Jan 2023 11:36:25 +0000 (13:36 +0200)
commitd0e99511834b6828c960e978d9a8cb6e5731250d
treee7b062c1f9d28a55083477a1462286a7923a57fdtree
parentde7d0ff301fccc75281d7d8eb98c4a47faacf32dcommit | diff
parent80f8a66dede0a4b4e9e846765a97809c6fe49ce5commit | 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
drivers/net/wireless/mediatek/mt76/dma.c diff1 | diff2 | blob | history
include/net/mac80211.h diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/util.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.