> -----Original Message----- > From: Iremonger, Bernard > Sent: Friday, February 13, 2015 2:30 PM > To: Mcnamara, John; dev at dpdk.org > Subject: RE: [dpdk-dev] [PATCH v4 3/5] doc: Fix encoding of (r) character > > The following error occurs when applying this patch: > > :Applying: doc: Fix encoding of (r) character > error: patch failed: doc/guides/rel_notes/supported_features.rst:51 > error: doc/guides/rel_notes/supported_features.rst: patch does not apply > Patch failed at 0001 doc: Fix encoding of (r) character >
Hi Bernard, That part of the patchset contains a fix for an non-UTF8 character so it probably needs to saved/transferred carefully. Email clients may well mess it up. It should apply cleanly though. I just tried it with a clean clone and the pwcient patchwork client: $ git clone http://dpdk.org/git/dpdk Cloning into 'dpdk'... $ cd dpdk $ pwclient search encoding ID State Name -- ----- ---- 2852 Superseded [dpdk-dev,v2,3/4] doc: Fix encoding of (r) character 2914 Superseded [dpdk-dev,v3,3/4] doc: Fix encoding of (r) character 2930 New [dpdk-dev,v4,3/5] doc: Fix encoding of (r) character $ pwclient git-am 2930 Applying patch #2930 using 'git am' Description: [dpdk-dev,v4,3/5] doc: Fix encoding of (r) character Applying: doc: Fix encoding of (r) character $ git log -1 --oneline eca8a8c doc: Fix encoding of (r) character John. --