Skip to content

[release-0.5] support large scale for ads mode #907

@kmesh-bot

Description

@kmesh-bot

Manual cherrypick required.

#610 failed to apply on top of branch "release-0.5":

Applying: support lage scale for ads mode
Using index info to reconstruct a base tree...
M	bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.c
M	bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.h
Falling back to patching base and 3-way merge...
Auto-merging bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.h
Auto-merging bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.c
CONFLICT (content): Merge conflict in bpf/deserialization_to_bpf_map/deserialization_to_bpf_map.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 support lage scale for ads mode
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions