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(-)
>>>
>>
>
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/17.eml
Applying: tipc: remove interface state mirroring in bearer
fatal: corrupt patch at line 57
Patch failed at 0001 tipc: remove interface state mirroring in 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".
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/16.eml
Applying: tipc: reassembly failures should cause link reset
/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:13:
trailing whitespace.
tipc_link_reset(l_ptr);
error: net/tipc/link.c: does not exist in index
Patch failed at 0001 tipc: reassembly failures should cause link reset
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/15.eml
Applying: tipc: message reassembly using fragment chain
/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:20:
trailing whitespace.
int ret;
/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:21:
trailing whitespace.
ret = tipc_link_recv_fragment(&node->bclink.reasm_head,
/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:22:
trailing whitespace.
&node->bclink.reasm_tail,
/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:23:
trailing whitespace.
&buf);
/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:24:
trailing whitespace.
if (ret == LINK_REASM_ERROR)
fatal: corrupt patch at line 58
Patch failed at 0001 tipc: message reassembly using fragment chain
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]#
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/14.eml
Applying: tipc: don't reroute message fragments
/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:14:
trailing whitespace.
if (ret > 0) {
/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:16:
trailing whitespace.
spin_unlock_bh(&bc_lock);
/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:17:
trailing whitespace.
goto receive;
/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:18:
trailing whitespace.
}
/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:33:
trailing whitespace.
tipc_node_unlock(n_ptr);
error: net/tipc/bcast.c: does not exist in index
error: net/tipc/link.c: does not exist in index
Patch failed at 0001 tipc: don't reroute message fragments
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/13.eml
Applying: tipc: remove two indentation levels in tipc_recv_msg routine
/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:13:
trailing whitespace.
goto discard;
/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:18:
trailing whitespace.
goto discard;
/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:23:
trailing whitespace.
goto discard;
/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:32:
trailing whitespace.
goto discard;
/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:38:
trailing whitespace.
goto discard;
fatal: patch fragment without header at line 64: @@ -1593,98 +1589,97 @@ void
tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *b_ptr)
Patch failed at 0001 tipc: remove two indentation levels in tipc_recv_msg
routine
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/12.eml
Applying: net: misc: Remove extern from function prototypes
/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:31:
trailing whitespace.
int irda_irnet_create(irnet_socket *); /* Initialise an IrNET socket */
/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:32:
trailing whitespace.
int irda_irnet_connect(irnet_socket *); /* Try to connect over IrDA */
/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:33:
trailing whitespace.
void irda_irnet_destroy(irnet_socket *); /* Teardown an IrNET socket */
/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:34:
trailing whitespace.
int irda_irnet_init(void); /* Initialise IrDA part of IrNET */
/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:35:
trailing whitespace.
void irda_irnet_cleanup(void); /* Teardown IrDA part of IrNET */
fatal: corrupt patch at line 39
Patch failed at 0001 net: misc: Remove extern from function prototypes
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/11.eml
Applying: tipc: simplify the link lookup routine
fatal: patch fragment without header at line 100: @@ -2580,25 +2500,21 @@ void
tipc_link_set_queue_limits(struct tipc_link *l_ptr, u32 window) static struct
tipc_link *link_find_link(const char *name,
Patch failed at 0001 tipc: simplify the link lookup routine
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/10.eml
Applying: tipc: correct return value of link_cmd_set_value routine
/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:12:
trailing whitespace.
int res = 0;
/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:20:
trailing whitespace.
default:
/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:21:
trailing whitespace.
res = -EINVAL;
/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:22:
trailing whitespace.
break;
/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:26:
trailing whitespace.
return res;
error: net/tipc/link.c: does not exist in index
Patch failed at 0001 tipc: correct return value of link_cmd_set_value routine
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/9.eml
Applying: tipc: correct return value of recv_msg routine
/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:14:
trailing whitespace.
return NET_RX_DROP;
/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:22:
trailing whitespace.
return NET_RX_SUCCESS;
/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:27:
trailing whitespace.
return NET_RX_DROP;
/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:39:
trailing whitespace.
return NET_RX_DROP;
/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:47:
trailing whitespace.
return NET_RX_SUCCESS;
error: net/tipc/eth_media.c: does not exist in index
error: net/tipc/ib_media.c: does not exist in index
Patch failed at 0001 tipc: correct return value of recv_msg routine
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/8.eml
Applying: tipc: avoid unnecessary lookup for tipc bearer instance
/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:16:
trailing whitespace.
* tipc_block_bearer - Block the bearer, and reset all its links
/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:19:
trailing whitespace.
int tipc_block_bearer(struct tipc_bearer *b_ptr)
/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:34:
trailing whitespace.
pr_info("Blocking bearer <%s>\n", b_ptr->name);
/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:45:
trailing whitespace.
int tipc_block_bearer(struct tipc_bearer *b_ptr);
/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:56:
trailing whitespace.
tipc_block_bearer(eb_ptr->bearer);
error: net/tipc/bearer.c: does not exist in index
error: net/tipc/bearer.h: does not exist in index
error: net/tipc/eth_media.c: does not exist in index
error: net/tipc/ib_media.c: does not exist in index
Patch failed at 0001 tipc: avoid unnecessary lookup for tipc bearer instance
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/7.eml
Applying: tipc: make bearer and media naming consistent
/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:16:
trailing whitespace.
res = m_ptr->enable_media(b_ptr);
/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:25:
trailing whitespace.
b_ptr->media->disable_media(b_ptr);
/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:38:
trailing whitespace.
* @enable_media: routine which enables a media
/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:39:
trailing whitespace.
* @disable_media: routine which disables a media
/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:60:
trailing whitespace.
* Copyright (c) 2005-2008, 2011-2013, Wind River Systems
fatal: patch fragment without header at line 85: @@ -58,7 +58,7 @@ struct
eth_bearer {
Patch failed at 0001 tipc: make bearer and media naming consistent
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/6.eml
Applying: tipc: silence sparse warnings
/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:14:
trailing whitespace.
const unchar __user *sect_crs;
/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:23:
trailing whitespace.
sect_crs = msg_sect[curr_sect].iov_base;
/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:35:
trailing whitespace.
if (TIPC_SKB_CB(buf)->handle != NULL)
fatal: patch fragment without header at line 47: @@ -1687,7 +1687,7 @@ restart:
Patch failed at 0001 tipc: silence sparse warnings
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/5.eml
Applying: tipc: remove iovec length parameter from all sending functions
/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:18:
trailing whitespace.
unsigned int len, u32 destnode);
/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:25:
trailing whitespace.
unsigned int len, u32 destaddr)
fatal: corrupt patch at line 29
Patch failed at 0001 tipc: remove iovec length parameter from all sending
functions
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/4.eml
Applying: tipc: don't use memcpy to copy from user space
/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:13:
trailing whitespace.
int dsz, sz, hsz;
/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:14:
trailing whitespace.
unsigned char *to;
/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:18:
trailing whitespace.
hsz = msg_hdr_sz(hdr);
/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:31:
trailing whitespace.
to = (*buf)->data + hsz;
/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:32:
trailing whitespace.
if (total_len && memcpy_fromiovecend(to, msg_sect, 0, dsz)) {
error: net/tipc/msg.c: does not exist in index
Patch failed at 0001 tipc: don't use memcpy to copy from user space
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/3.eml
Applying: tipc: set sk_err correctly when connection fails
/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:13:
trailing whitespace.
sk->sk_err = ECONNREFUSED;
/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:22:
trailing whitespace.
sk->sk_err = -res;
error: net/tipc/socket.c: does not exist in index
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]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/2.eml
Applying: tipc: avoid possible deadlock while enable and disable bearer
/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:11:
trailing whitespace.
struct tipc_link_req *temp_req;
fatal: corrupt patch at line 15
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".
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am
/root/tipc_patch/1.eml
Applying: tipc: fix oops when creating server socket fails
/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:13:
trailing whitespace.
if (!sock) {
/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:14:
trailing whitespace.
idr_remove(&s->conn_idr, con->conid);
/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:15:
trailing whitespace.
s->idr_in_use--;
/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:16:
trailing whitespace.
kfree(con);
/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:18:
trailing whitespace.
}
error: net/tipc/server.c: does not exist in index
Patch failed at 0001 tipc: fix oops when creating server socket 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]#
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]# git am --abort
fatal: Not a valid object name HEAD
fatal: ambiguous argument 'ORIG_HEAD': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[root@10ce81b0d560 linux-3.10.0-327.18.2.el7.x86_64]#
------------------------------------------------------------------------------
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
