Re: [tipc-discussion] [PATCH 3.10 00/17] patches for xiang in 3.10

2016-12-15 Thread XIANG Haiming
Hi Ying, I have installed Thunderbird to receive these patch file and save them to *.eml file.(from 1.eml to 17.eml, refer to the attached file) And then use command "git am *.eml" and I get some error (detailed info refer to patch_result.txt) Please help me to analyze these error. Thank you.

Re: [tipc-discussion] [PATCH 3.10 00/17] patches for xiang in 3.10

2016-12-15 Thread Jon Maloy
Hi Xiang, You have to apply the patches one by one, in order 1-17. Since your Linux version is not exactly the same as the one from which I generated the patches, you may also need to try with the switch "-3", e.g. "git am -3 1.eml". This will try to do a 3-way merge in case the patch doesn't