Stanislaw Gruszka <[email protected]> writes: > More mt76x0/mt76x2 integration. > > This set is quite big but I would like to move patches upstream > from my github tree as fast as possible. I have there 42 more > ready to post patches from me and Lorenzo. > https://github.com/sgruszka/wireless-drivers-next/commits/mt76x0-draft-v3 > > Note this set include: > "mt76x0: fix wrong usage of wcid_mask in remove_interface" > patch with I posted as fix for 4.19 . I assume this will be > auto (or manually?) merged when -next will go to 4.20.
The problem is that having two identical patches with different commit ids will confuse git and can create annoying merge conflicts. A much safer approach is that the patch is first applied to wireless-drivers and then I merge wireless-drivers into wireless-drivers-next. I'm planning to do that in a day or two, I was away for a long weekend so lagging behind again. But the patch "mt76x0: fix wrong usage of wcid_mask in remove_interface" should be dropped from this series. But Felix is planning to send all pending mt76 to me via a pull request anyway so you don't need to worry about this. -- Kalle Valo
