.git/rebase-apply/patch:111: trailing whitespace. { warning: 1 line adds whitespace errors. Applying: resolv: implement ipv4+ipv6 flags in resolv.conf (bug 30544) Applying: resolv: Create test for ipv4 and ipv6 resolv.conf flags