Good start for learning git :) Now drop backup files that name ends with tilde symbol like this: src/mainboard/jetway/j7bxan/Kconfig~ Then, try to rebase to current tree commit, as I can't apply the patch to freshly cloned tree.
P.S. try that copies detection, so less text to review.
Thanks, Tadas