Messages in this thread | | | Date | Mon, 14 Apr 2008 15:50:51 +1000 | From | Stephen Rothwell <> | Subject | linux-next: ext4 merge conflict |
| |
Hi Ted,
Today's linux-tree merge of the ext4 tree got a new conflict in fs/jbd2/revoke.c between commit 1076d17ac70d1bb28fadc6f4bd96977b56897025 ("jbd/jbd2 NULL noise") from Linus' tree and e898f3154d78d1520265aade0992981866d827fb ("jbd2: tidy up revoke cache initialisation and destruction") from the ext4 tree. It was simple to fix up but you should check it anyway. You could resolve this conflict yourself by pulling Linus' current tree into yours.
This, of course, is another example of a trivial non-bug fixup that was merged into Linus' tree after rc7 when it could just as easily been sent to the subsystem maintainer and waited until 2.6.26. And, in fact, the spot that was fixed in Al's patch that caused the conflict has been removed in the ext4 tree. Oh, well.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |