On Mon, Nov 5, 2018 at 5:04 AM Kalle Valo <kvalo@xxxxxxxxxxxxxx> wrote: > This patchset (I think it was with the first patch, but not sure) had some > conflicts but 3-way merge was able to automatically solve them. Please check > the end result anyway: > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=77adda81e264e0c93af9570ac4ada82a5d0f5d99 I see the same. There were some unrelated changes to this file that you merged to your pending tree in the meantime. The end result looks fine to me. Thanks for the heads up. Brian
