xfs + rmap?

["Adam McKenna" <adam-dated-1013032432.ea4245@xxxxxxxxxxxx>]

I'm trying to merge Rik van Riel's rmap-12a patch with current CVS, I'm
having a couple of problems..  I was wondering if someone could give me a
clue how to work these out (or tell me if they can't be)

There is a huge hunk of mm/vmscan.c that looks to be totally incompatible,
the .rej is about 18 kilobytes.

--Adam