From: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Date: Tue, 30 Apr 2019 19:55:45 +0300 > David Miller <davem@xxxxxxxxxxxxx> writes: > >> Thanks for the conflict resolution information, it is very helpful. >> >> However, can you put it into the merge commit text next time as well? >> I cut and pasted it in there when I pulled this stuff in. > > A good idea, I'll do that. Just to be sure, do you mean that I should > add it only with conflicts between net and net-next (like in this case)? > Or should I add it everytime I see a conflict, for example between > wireless-drivers-next and net-next? I hope my question is not too > confusing... When there is a major conflict for me to resolve when I pull in your pull reqeust, please place the conflict resolution help text into the merge commit message. I hope this is now clear :-)
