Re: [2.6 patch] fs/jbd/journal.c: cleanups

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Ingo Molnar
Date: Monday, February 18, 2008 - 6:55 am

* Theodore Tso <tytso@mit.edu> wrote:


Btw., if people have problems with rejects from trivial patches, the 
'mpatch' tool does wonders in resolving the easy ones:

  http://oss.oracle.com/~mason/mpatch/

when you get a .rej file, first check whether mpatch can resolve it 
conflict-free:

  mpatch -d kernel/somefile.c.rej

if there are no conflicts then:

  mpatch -a kernel/somefile.c.rej

quilt refresh, review the result and it's done in the majority of cases.

	Ingo
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[2.6 patch] fs/jbd/journal.c: cleanups, Adrian Bunk, (Sun Feb 17, 1:19 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Andreas Dilger, (Mon Feb 18, 12:04 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Ingo Molnar, (Mon Feb 18, 12:12 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Theodore Tso, (Mon Feb 18, 4:49 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Ingo Molnar, (Mon Feb 18, 5:57 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Adrian Bunk, (Mon Feb 18, 6:12 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Theodore Tso, (Mon Feb 18, 6:28 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Theodore Tso, (Mon Feb 18, 6:31 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Ingo Molnar, (Mon Feb 18, 6:31 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Ingo Molnar, (Mon Feb 18, 6:55 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Theodore Tso, (Mon Feb 18, 8:11 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Ingo Molnar, (Mon Feb 18, 9:22 am)
Re: [2.6 patch] fs/jbd/journal.c: cleanups, Adrian Bunk, (Wed Feb 27, 12:39 pm)
[2.6 patch] unexport journal_update_superblock, Adrian Bunk, (Wed Feb 27, 2:20 pm)