| Message ID | 20190823103805.23966.74944.stgit@dceara.remote.csb |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ovn-controller: Logical flow processing optimizations | expand |
Bleep bloop. Greetings Dumitru Ceara, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. git-am: fatal: sha1 information is lacking or useless (controller/ofctrl.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 ofctrl: Avoid recomputing match hash in ofctrl_dup_flow(). The copy of the patch that failed is found in: /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.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". Please check this out. If you feel there has been an error, please email aconole@redhat.com Thanks, 0-day Robot
diff --git a/controller/ofctrl.c b/controller/ofctrl.c index 8928205..3131baf 100644 --- a/controller/ofctrl.c +++ b/controller/ofctrl.c @@ -743,7 +743,7 @@ ofctrl_dup_flow(struct ovn_flow *src) dst->ofpacts = xmemdup(src->ofpacts, src->ofpacts_len); dst->ofpacts_len = src->ofpacts_len; dst->sb_uuid = src->sb_uuid; - dst->match_hmap_node.hash = ovn_flow_match_hash(dst); + dst->match_hmap_node.hash = src->match_hmap_node.hash; dst->uuid_hindex_node.hash = uuid_hash(&src->sb_uuid); return dst; }
Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- controller/ofctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)