And please remember to use the "-u" flag whenever using "diff".
Oh yes; this was just FYI, not a patch
Anyhow - future patches will hopefully come from :
git diff -p v485..
And in case it wasn't clear - the 'new' patches are needed to allow (reasonably) clean consecutive patch application. There's some fuzz but...
There are a fair few files in the git repo that were patched in but never patched out:
Only in hijack/arch/arm/special: empeg_ani.h.hj
Only in hijack/arch/arm/special: empeg_audio.h
Only in hijack/arch/arm/special: empeg_audio3.c.orig
Only in hijack/arch/arm/special: empeg_audio3.c.rej
Only in hijack/arch/arm/special: empeg_display.c.orig
Only in hijack/arch/arm/special: empeg_mixer.c.orig
Only in hijack/arch/arm/special: hijack.c.orig
Only in hijack/arch/arm/special: ir_codes.h
Only in hijack/arch/arm/special: notify.c.orig
Only in hijack/arch: i386
Only in hijack/arch: m68k
Only in hijack/arch: mips
Only in hijack/arch: ppc
Only in hijack/arch: s390
Only in hijack/arch: sparc
Only in hijack/arch: sparc64
Only in hijack: config.ini
Only in hijack/drivers/block: flash-empeg.c.orig
Only in hijack/drivers/char: empeg_ir.c
Only in hijack/drivers/char: empeg_ir.h
Only in hijack/drivers/char: empeg_ir_fiq.S
Only in hijack: empeg_notify
Only in hijack: ide-probe.mk1
Only in hijack/include: asm-alpha
Only in hijack/include/asm-arm/arch-sa1100: empeg.h
Only in hijack/include: asm-i386
Only in hijack/include: asm-m68k
Only in hijack/include: asm-mips
Only in hijack/include: asm-ppc
Only in hijack/include: asm-s390
Only in hijack/include: asm-sparc
Only in hijack/include: asm-sparc64
Only in hijack/include/linux: bitops.h
Only in hijack/include/linux: bitops.h.rej
Only in hijack/include/linux: reiserfs_fs.h
Only in hijack/include/linux: reiserfs_fs_i.h
Only in hijack/include/linux: reiserfs_fs_sb.h
Only in hijack/include/linux: time.h
Only in hijack/include/linux: time.h.rej
Only in hijack: junk
Only in hijack: reboot
and buildit (which is useful BTW) is not always in the patches.
I think what I'll do is backup to v484. Then untar your v485 package and take it from there...