Revert "fromupstream: use --reject for git-apply"

This reverts commit 3a4ebdaa6e0d7aefdc25765d473e09979c554bc3.

When trying to apply a patch that cleanly applies, I'm now getting
errors.  Removing the "--reject" flag fixes it.  Example: -b=b:161373813 -t="None" pw://lkml/1293172

As per git documentation, "--reject" is incompatible with "-3" and
I think we want "-3" more (if nothing else because that's what we've
historically had).  If someone needs "--reject" I suppose we could
add another option...

BUG=None -b=b:161373813 -t="None" pw://lkml/1293172

Change-Id: I8261da243b145d2993ca53a813b3216d837ad5ec
Commit-Queue: Douglas Anderson <>
Tested-by: Douglas Anderson <>
Reviewed-by: Brian Norris <>
1 file changed