# Notes on modifying 2.6.28.10 stable patch in order for it to
# directly over Nokia-patched 2.6.28-omap1 kernel (0094803.3+0m5)
#
# See http://natisbad.org/N900/n900-custom-kernel.html

$ bunzip2 patch-2.6.28.10.bz2
$ cd kernel-2.6.28
$ patch -p1 -i ../patch-2.6.28.10

patching file Makefile
Hunk #2 succeeded at 560 (offset 5 lines).
-> no problem

patching file block/genhd.c
Hunk #4 succeeded at 998 (offset 14 lines).
-> no problem

patching file drivers/bluetooth/btsdio.c
Hunk #1 succeeded at 86 (offset -5 lines).
-> no problem

patching file drivers/cpuidle/governors/menu.c
Hunk #1 succeeded at 16 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 55 with fuzz 2 (offset 6 lines).
Hunk #3 succeeded at 112 (offset 7 lines).
-> no problem

patching file drivers/gpio/gpiolib.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
-> already fixed in nokia patch - removing hunk from 2.6.28.10 patch

patching file drivers/mmc/card/block.c
Reversed (or previously applied) patch detected!  Assume -R? [n] 
-> already fixed in nokia patch - removing hunk from 2.6.28.10 patch

patching file drivers/serial/8250.c
Hunk #1 succeeded at 2028 (offset 14 lines).
Hunk #2 succeeded at 2061 (offset 14 lines).
-> no problem

patching file drivers/usb/gadget/u_ether.c
Hunk #1 succeeded at 174 (offset -1 lines).
Hunk #2 succeeded at 182 (offset -1 lines).
-> no problem

patching file drivers/watchdog/Kconfig
Hunk #1 succeeded at 406 (offset 7 lines).
-> no problem

patching file fs/eventpoll.c
Reversed (or previously applied) patch detected!  Assume -R? [n] 
-> removed hunks 1,2,3,4,6 and 11 from 2.6.28.10 patch (already in nokia patch)

patching file fs/ext4/balloc.c
Hunk #6 FAILED at 491.
1 out of 6 hunks FAILED -- saving rejects to file fs/ext4/balloc.c.rej
-> hunk 6 contains sb->s_dirt = 1; which has been replaced by
   mark_sb_dirty(sb); in nokia patch (mark_sb_dirty() is defined in
   fs/fs-writeback.c by nokia patch). modifying 2.6.28.10 patch to use
   mark_sb_dirty(sb); Also replacing other sb->s_dirt = 1 in hunk 4 of
   ext4/super.c patch

patching file fs/ext4/super.c
Hunk #6 FAILED at 2914.
1 out of 6 hunks FAILED -- saving rejects to file fs/ext4/super.c.rej
-> hunk 6 contains sb->s_dirt = 0; which has been replaced by
   mark_sb_clean(sb); in nokia patch (mark_sb_clean() is defined in
   fs/fs-writeback.c). modifying 2.6.28 patch to use mark_sb_clean(sb);

patching file fs/fs-writeback.c
Hunk #1 succeeded at 315 (offset 41 lines).
Hunk #2 succeeded at 340 (offset 41 lines).
Hunk #3 succeeded at 464 (offset 41 lines).
Hunk #4 succeeded at 483 (offset 41 lines).
Hunk #5 succeeded at 513 (offset 41 lines).
Hunk #6 succeeded at 545 (offset 41 lines).
Hunk #7 succeeded at 565 (offset 41 lines).
Hunk #8 succeeded at 673 (offset 41 lines).
Hunk #9 succeeded at 684 (offset 41 lines).
Hunk #10 succeeded at 727 (offset 41 lines).
Hunk #11 succeeded at 744 (offset 41 lines).
-> no problem. Note that nokia patch also defines is_sb_dirty()

patching file fs/ubifs/file.c
Hunk #4 succeeded at 493 (offset 9 lines).
-> no problem

patching file include/linux/fs.h
Hunk #4 succeeded at 2044 (offset 13 lines).
-> no problem

patching file include/linux/sched.h
Hunk #2 FAILED at 632.
1 out of 2 hunks FAILED -- saving rejects to file include/linux/sched.h.rej
-> already fixed in nokia patch - removing hunk from 2.6.28.10 patch

patching file include/linux/serial.h
Reversed (or previously applied) patch detected!  Assume -R? [n] 
-> already fixed in nokia patch - removing hunk from 2.6.28.10 patch

patching file kernel/cgroup.c
Reversed (or previously applied) patch detected!  Assume -R? [n] 
-> already fixed in nokia patch - removing hunk from 2.6.28.10 patch

patching file kernel/hrtimer.c
Hunk #1 succeeded at 1630 (offset 2 lines).
-> no problem

patching file kernel/posix-timers.c
Hunk #1 succeeded at 477 (offset 7 lines).
Hunk #2 succeeded at 665 (offset 7 lines).
Hunk #3 succeeded at 695 (offset 7 lines).
Hunk #4 succeeded at 763 (offset 7 lines).
Hunk #5 succeeded at 818 (offset 7 lines).
Hunk #6 succeeded at 906 (offset 7 lines).
Hunk #7 succeeded at 919 (offset 7 lines).
Hunk #8 succeeded at 936 (offset 7 lines).
Hunk #9 succeeded at 966 (offset 7 lines).
-> no problem

patching file kernel/printk.c
Hunk #1 succeeded at 386 (offset 4 lines).
Hunk #2 succeeded at 749 (offset 7 lines).
-> no problem

patching file kernel/timer.c
Hunk #1 succeeded at 1147 (offset 3 lines).
Hunk #2 succeeded at 1170 (offset 3 lines).
Hunk #3 succeeded at 1181 (offset 3 lines).
Hunk #4 succeeded at 1192 (offset 3 lines).
Hunk #5 succeeded at 1326 (offset 3 lines).
Hunk #6 succeeded at 1418 (offset 3 lines).
-> no problem

patching file mm/memory.c
Hunk #1 succeeded at 1882 (offset 1 line).
-> no problem

patching file mm/page-writeback.c
Hunk #1 succeeded at 980 (offset 112 lines).
Hunk #2 succeeded at 995 (offset 112 lines).
-> !!!!! A lot of movement. Would have to take a closer look
   if something goes wrong

patching file mm/swapfile.c
Hunk #1 succeeded at 1352 (offset 129 lines).
Hunk #2 succeeded at 1597 (offset 130 lines).
-> no problem

patching file net/core/sock.c
Hunk #2 succeeded at 1152 (offset 15 lines).
-> no problem

patching file net/mac80211/rc80211_minstrel.c
Hunk #1 FAILED at 389.
Hunk #2 FAILED at 410.
2 out of 2 hunks FAILED -- saving rejects to file net/mac80211/rc80211_minstrel.c.rej
-> already fixed in nokia patch - removing hunk from 2.6.28.10 patch

patching file net/mac80211/tx.c
Hunk #1 succeeded at 1302 (offset 3 lines).
Hunk #2 succeeded at 1338 (offset 3 lines).
-> no problem

patching file security/device_cgroup.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
-> already fixed in nokia patch - removing hunk from 2.6.28.10 patch