1428 failed to apply on top of branch "stable/zed":
Applying: Add neutron policy server support
.git/rebase-apply/patch:318: trailing whitespace.
.git/rebase-apply/patch:438: trailing whitespace.
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M charts/neutron/templates/configmap-bin.yaml
M charts/neutron/templates/configmap-etc.yaml
M charts/neutron/templates/deployment-server.yaml
M charts/neutron/values.yaml
M roles/defaults/vars/main.yml
M roles/neutron/tasks/main.yml
M roles/neutron/vars/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/neutron/vars/main.yml
CONFLICT (content): Merge conflict in roles/neutron/vars/main.yml
Auto-merging roles/neutron/tasks/main.yml
Auto-merging roles/defaults/vars/main.yml
CONFLICT (content): Merge conflict in roles/defaults/vars/main.yml
Auto-merging charts/neutron/values.yaml
CONFLICT (content): Merge conflict in charts/neutron/values.yaml
Auto-merging charts/neutron/templates/deployment-server.yaml
Auto-merging charts/neutron/templates/configmap-etc.yaml
CONFLICT (content): Merge conflict in charts/neutron/templates/configmap-etc.yaml
Auto-merging charts/neutron/templates/configmap-bin.yaml
CONFLICT (content): Merge conflict in charts/neutron/templates/configmap-bin.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add neutron policy server support
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".
Manual cherrypick required.
1428 failed to apply on top of branch "stable/zed":