This is a patch in a patch. It may happen that the patch was already
applied previously, so this amends the patch line to continue if the
patch doesn't apply. It also sets the direction to forward-only.
Also removes two trailing whitespace warnings.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>