* linux-next: ext4 merge conflict
@ 2008-04-14 5:50 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-04-14 5:50 UTC (permalink / raw
To: Theodore Tso; +Cc: Al Viro, linux-next, Linus, LKML
[-- Attachment #1: Type: text/plain, Size: 903 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-04-14 5:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-14 5:50 linux-next: ext4 merge conflict Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).