Sergey Matyukevich <sergey.matyukevich.os@xxxxxxxxxxxxx> writes: > Hello Kalle, > >> > Fix tx path regression. Lock should be held when queuing packets >> > to h/w fifos in order to properly handle configurations with >> > multiple enabled interfaces. >> > >> > Signed-off-by: Sergey Matyukevich <sergey.matyukevich.os@xxxxxxxxxxxxx> >> >> 2 patches applied to wireless-drivers.git, thanks. >> >> 20da2ec06bfa qtnfmac: lock access to h/w in tx path >> a715b3a0efe7 qtnfmac: cancel scans on wireless interface changes > > Could you please clarify a couple of points regarding wireless-drivers-next > and wireless-drivers trees. I checked development process article at > wireless.wiki.kernel.org, but it looks a bit outdated. You mean this page: https://wireless.wiki.kernel.org/en/developers/process Yeah, that is outdated :) > So am I correct assuming the following: - these two fixes were applied > to wireless-drivers because I asked to to queue them to 4.14 Correct. > - these two fixes will show up in wireless-drivers-next at some point > in the future after you move wireless-drivers-next forward, rebasing > it on top of one of the upcoming "-rc" I would not use the term "rebase" here, as that means rewriting the history which should be avoided on public trees. What I usually do is to "merge" (git pull) or "fast forward" (git pull --ff-only). You are correct that eventually commits from wireless-drivers trickle down to wireless-drivers-next, I guess usually it takes something like 2-4 weeks. Most of them time they trickle down when Dave merges net to net-next and I fast forward wireless-drivers-next to latest net-next (after Dave has pulled from me). But occasionally I also merge wireless-drivers to wireless-drivers-next myself, for example I did that last cycle as there were major conflicts on iwlwifi and we wanted to fix those early on. The earlier the conflicts are resolved the smoother it is for everyone. So if you have needs for getting the commits from wireless-drivers to wireless-drivers-next please let me know and let's see what's the best way forward. Did this help? -- Kalle Valo
