Hi Jon, OK, I try to apply the patches one by one from 1 to 17.
I firstly apply the 2.eml (because there is no "net/tipc/server.c" file for 1.eml) and I got the follow error: [root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am -3 /root/tipc_patch/2.eml Applying: tipc: avoid possible deadlock while enable and disable bearer fatal: corrupt patch at line 15 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 tipc: avoid possible deadlock while enable and disable bearer The copy of the patch that failed is found in: /root/rpmbuild/BUILD/kernel-3.10.0-327.18.2.el7/linux-3.10.0-327.18.2.el7.x86_64/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". There is also some error for 3.eml: [root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am -3 /root/tipc_patch/3.eml Applying: tipc: set sk_err correctly when connection fails fatal: sha1 information is lacking or useless (net/tipc/socket.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 tipc: set sk_err correctly when connection fails The copy of the patch that failed is found in: /root/rpmbuild/BUILD/kernel-3.10.0-327.18.2.el7/linux-3.10.0-327.18.2.el7.x86_64/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". [root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# Please help me to resolve this error. Thank you. -----Original Message----- From: Jon Maloy [mailto:ma...@donjonn.com] Sent: 2016年12月15日 21:20 To: XIANG Haiming; Ying Xue; Jon Maloy; tipc-discussion@lists.sourceforge.net; parthasarathy.bhuvara...@ericsson.com Subject: Re: [PATCH 3.10 00/17] patches for xiang in 3.10 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 apply cleanly. ///jon On 12/15/2016 03:46 AM, XIANG Haiming wrote: > 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. > > > > > -----Original Message----- > From: Ying Xue [mailto:ying....@windriver.com] > Sent: 2016年12月12日 17:18 > To: XIANG Haiming; Jon Maloy; tipc-discussion@lists.sourceforge.net; > parthasarathy.bhuvara...@ericsson.com > Cc: ma...@donjonn.com > Subject: Re: [PATCH 3.10 00/17] patches for xiang in 3.10 > > On 12/12/2016 03:53 PM, XIANG Haiming wrote: >> Hi Ying, >> >> I try to convert your email([PATCH 3.10 04/17] tipc: don't use memcpy to >> copy from user space) to patch file 3.patch. >> >> I use command " patch -p0 < /root/3.patch" , there is the follow error: >> >> patching file net/tipc/msg.c >> Hunk #1 succeeded at 76 with fuzz 2. >> Hunk #2 FAILED at 92. >> 1 out of 2 hunks FAILED -- saving rejects to file net/tipc/msg.c.rej >> >> Do you know why the secondary change cannot be apply? > The good news is that your patch format is recognized by "patch" > command, but the bad news is that you met one conflict between your patch and > your Linux kernel source code, which means that you may still lack some > necessary patches of TIPC. Of course, you can understand what conflict you > encountered by analyzing net/tipc/msg.c.rej. Meanwhile, I strongly suggest > you don't you "patch" to apply patches into your Linux source code because > it's hard for us to revert a patch applied by "patch" command. > > As I have no your environment on hand, it's hard for me to help you. > >> >> -----Original Message----- >> From: Ying Xue [mailto:ying....@windriver.com] >> Sent: 2016年12月9日 18:01 >> To: XIANG Haiming; Jon Maloy; tipc-discussion@lists.sourceforge.net; >> parthasarathy.bhuvara...@ericsson.com >> Cc: ma...@donjonn.com >> Subject: Re: [PATCH 3.10 00/17] patches for xiang in 3.10 >> >> On 12/09/2016 03:30 PM, XIANG Haiming wrote: >>> Hi Ying, >>> >>> I have two question about these patches: >>> >>> 1. There is no " net/tipc/server.c" file in our Kernel >>> 3.10.0-327.18.2.el7.x86_64 >> It's a bit strange. server.c was merged since v3.10-rc4-858-gc5fa7b3. >> >>> 2. I have saved 17 patches email to xxx.msg(from 1.msg to 17.msg) >>> file. And then copy these msg file to one directory such as tipc-patch And >>> then I use command "git am tipc-patch", But there is no file changed. >>> >>> If I use command "git am 1.msg", there is error " Patch format detection >>> failed." >> Yes, this command is right. I often use the command to apply patch of email >> format into kernel. >> >> Probably you use outlook email client. In fact I use Thunderbird, and this >> way works fine with me. >> >>> If I use command "git am 1.txt" (I save email to 1.txt), there is error " >>> Patch format detection failed." >>> >>> Maybe there is some misunderstanding, please tell me the correct patch >>> method. Thank you. >>> >>> >>> >>> -----Original Message----- >>> From: Ying Xue [mailto:ying....@windriver.com] >>> Sent: 2016年12月7日 19:28 >>> To: XIANG Haiming; Jon Maloy; tipc-discussion@lists.sourceforge.net; >>> parthasarathy.bhuvara...@ericsson.com >>> Cc: ma...@donjonn.com >>> Subject: Re: [PATCH 3.10 00/17] patches for xiang in 3.10 >>> >>> Hi Xiang, >>> >>> You can save all patches in your email inbox as files one by one. When you >>> enter the folder of Linux kernel source, please run the command below: >>> >>> git am patch file >>> >>> The patch files is just saved through email. >>> >>> Once all 17 patches are applied into kernel source tree, you then >>> can compile your kernel as well as TIPC module, >>> >>> Regards, >>> Ying >>> >>> On 12/07/2016 11:33 AM, XIANG Haiming wrote: >>>> Hi Jon, >>>> >>>> How to get these patches and how to patch these patches to our kernel 3.10? >>>> >>>> >>>> -----Original Message----- >>>> From: Jon Maloy [mailto:jon.ma...@ericsson.com] >>>> Sent: 2016年12月6日 19:22 >>>> To: tipc-discussion@lists.sourceforge.net; >>>> parthasarathy.bhuvara...@ericsson.com; ying....@windriver.com; >>>> jon.ma...@ericsson.com >>>> Cc: ma...@donjonn.com; XIANG Haiming >>>> Subject: [PATCH 3.10 00/17] patches for xiang in 3.10 >>>> >>>> See subject. >>>> ///jon >>>> >>>> Erik Hugne (6): >>>> tipc: set sk_err correctly when connection fails >>>> tipc: simplify the link lookup routine >>>> tipc: don't reroute message fragments >>>> tipc: message reassembly using fragment chain >>>> tipc: reassembly failures should cause link reset >>>> tipc: remove interface state mirroring in bearer >>>> >>>> Joe Perches (1): >>>> net: misc: Remove extern from function prototypes >>>> >>>> Ying Xue (9): >>>> tipc: fix oops when creating server socket fails >>>> tipc: don't use memcpy to copy from user space >>>> tipc: remove iovec length parameter from all sending functions >>>> tipc: silence sparse warnings >>>> tipc: make bearer and media naming consistent >>>> tipc: avoid unnecessary lookup for tipc bearer instance >>>> tipc: correct return value of recv_msg routine >>>> tipc: correct return value of link_cmd_set_value routine >>>> tipc: remove two indentation levels in tipc_recv_msg routine >>>> >>>> dingtianhong (1): >>>> tipc: avoid possible deadlock while enable and disable bearer >>>> >>>> net/irda/irnet/irnet.h | 15 +- >>>> net/l2tp/l2tp_core.h | 57 +++-- >>>> net/mac80211/rate.h | 12 +- >>>> net/netfilter/nf_internals.h | 28 +-- >>>> net/rds/rds.h | 2 +- >>>> net/rxrpc/ar-internal.h | 150 ++++++------ >>>> net/tipc/bcast.c | 22 +- >>>> net/tipc/bearer.c | 54 +---- >>>> net/tipc/bearer.h | 14 +- >>>> net/tipc/core.h | 28 +-- >>>> net/tipc/discover.c | 17 +- >>>> net/tipc/eth_media.c | 76 +++--- >>>> net/tipc/ib_media.c | 66 +++--- >>>> net/tipc/link.c | 547 >>>> +++++++++++++++---------------------------- >>>> net/tipc/link.h | 24 +- >>>> net/tipc/msg.c | 27 +-- >>>> net/tipc/msg.h | 15 +- >>>> net/tipc/node.c | 7 +- >>>> net/tipc/node.h | 6 +- >>>> net/tipc/port.c | 66 +++--- >>>> net/tipc/port.h | 16 +- >>>> net/tipc/server.c | 15 +- >>>> net/tipc/socket.c | 16 +- >>>> net/wimax/wimax-internal.h | 18 +- >>>> net/wireless/core.h | 6 +- >>>> net/wireless/sysfs.h | 4 +- >>>> net/xfrm/xfrm_hash.h | 4 +- >>>> 27 files changed, 521 insertions(+), 791 deletions(-) >>>> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot _______________________________________________ tipc-discussion mailing list tipc-discussion@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tipc-discussion
