Luca Coelho <luca@xxxxxxxxx> writes: > On Tue, 2017-04-18 at 06:56 +0000, Kalle Valo wrote: >> Kalle Valo <kvalo@xxxxxxxxxxxxxx> writes: >> >> > Luca Coelho <luca@xxxxxxxxx> writes: >> > >> > > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git >> > > tags/iwlwifi-next-for-kalle-2017-04-13 >> > > >> > > for you to fetch changes up to 87d0e1af9db3bff4ec2f68fd4d032f89c23867a4: >> > > >> > > iwlwifi: mvm: separate queue mapping from queue enablement >> > > (2017-04-11 15:25:00 +0300) >> > > >> > > ---------------------------------------------------------------- >> > > Patches intended for v4.12: >> > > >> > > * Some small fixes here and there; >> > > * The usual cleanups and small improvements; >> > > * Work to support A000 devices continues; >> > > * New FW API version; >> > > * Some debugging improvements; >> > > >> > > ---------------------------------------------------------------- >> > >> > This one has few conflicts. I can fix those manually, but can you give >> > some guidance how? >> >> I think I got it now, see below for the diff I did. Can you please >> check that? >> >> The resolution is also in the pending branch: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/log/?h=pending > > > Yes, looks good! Thanks for resolving it and sorry for not foreseeing it > to give you a heads up. Good, thanks. I pushed it to master branch now. -- Kalle Valo
