Sergey Matyukevich <sergey.matyukevich...@quantenna.com> writes: >> > My assumption is that by default all the patches should cleanly apply >> > to wireless-drivers-next. I could apply the patch in question to >> > wireless-drivers-next without any issues. >> >> Odd. How did you apply it? My script uses 'git am -s -3' individually >> for each patch in the series, but to my knowledge that shouldn't cause >> any problems. > > It turns out I mechanically rebased my branch on top of w-d-n before writing > the previous email. Now I could reproduce the same failure when using this > command for the original patches downloaded from patchwork.
Ok, that makes sense. Most likely when git-rebase does a 3-way merge automatically and that's why you were able to successfully apply them. But as git-am was not able to use 3-way merge due to incorrect sha1 information it failed. > The problem was in conflict with qtnfmac fixes pulled to w-d-n from > w-d. Ok, thanks for investigating the root cause. -- Kalle Valo
