In this sparticular case nothing is essential, you could just ignore the
ax25.h.rej, we are talking about patching a "clean 2.0.33 source tree" with
ax25-modules-14e nothing further.
If you are dareing just delete the whitespaces, shown in the patch, and make
sure its equal to the + lines shown at the bottom of ax25.h.rej.
>
>
>
-- Regards Richard, 73. | "I see" said the blind man to his AX25 pa3gcu@pi8mid.#zld.nld.eu | deaf en dumb daughter, who replyed, ampr bzn.dbapxut@base7.g-net.pl | "Yes" Linux AX25. NET/ROM, "I have heard inet nysoon@tr.net | that what you see is what you get".