Michal Kazior <michal.kazior@xxxxxxxxx> writes: > Service mapping for main firmware branch was > incorrectly used for 10.x firmware and vice-versa. > This caused wmi_services in debugfs to print wrong > values. > > This actually fixes a problem with the previous > wmi service bitmap patch itself. For some reason > there was either a conflict that wasn't resolved > properly or git had a bad day. > > Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx> Thanks, applied. I just changed the commit log a bit: ath10k: fix a conflict bug in wmi service bitmap Service mapping for main firmware branch was incorrectly used for 10.x firmware and vice-versa. This caused wmi_services in debugfs to print wrong values. This fixes commit cff990ce7ddd6 ("ath10k: fix wmi service bitmap debug") where for some reason there was either a conflict that wasn't resolved properly or git had a bad day. Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx> Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html