On Thu, Oct 05, 2017 at 11:15:08AM +0200, Mason wrote: > Is there a magic option I should be passing to git am?
No, it's supposed to work out of the box. > The patch header contains: > > Content-Type: text/plain; charset=UTF-8; format=flowed > Content-Transfer-Encoding: quoted-printable That looks right. Though I wouldn't be surprised if whatever generated the "flowed" also screwed up patch whitespace. > The drivers/media/rc/Kconfig:469 part is > > --- a/drivers/media/rc/Kconfig > +++ b/drivers/media/rc/Kconfig > @@ -469,6 +469,11 @@ config IR_SIR > =09 To compile this driver as a module, choose M here: the module will > =09 be called sir-ir. > =20 > +config IR_TANGO > +=09tristate "Sigma Designs SMP86xx IR decoder" > +=09depends on RC_CORE > +=09depends on ARCH_TANGO || COMPILE_TEST > + > config IR_ZX > =09tristate "ZTE ZX IR remote control" > =09depends on RC_CORE After "git am" bails, what does .git/rebase-apply/patch look like? It should have the quoted-printable bits decoded. If it doesn't, then we need to figure out why the qp-decoding didn't kick in. It would help to see the whole input mbox then. If it does have the qp bits decoded, then I'd suspect that maybe there's whitespace damage caused by the MUA. -Peff
