Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
fs/reiserfs/journal.c between commit
afe70259076fff0446001eaa1a287f615241a357 ("reiserfs: convert j_flush_sem
to mutex") from Linus' tree and commit
fd0eea245ccc61779d3155066d21a06fe3320524
("misc:down_nowait-fs_reiserfs_journal") from the rr tree.
The former commit changed the semaphore to a mutex, so I expect the
latter patch is no longer needed. I used the version in Linus' tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgplccQDe1YWU.pgp
Description: PGP signature
