Re: XFS+Tux = patch trouble

[Ingo Molnar <mingo@xxxxxxx>]

On Mon, 5 Nov 2001, Roy Sigurd Karlsbakk wrote:

> Does anyone know how to merge the XFS and Tux patches?

it would be nice if SGI folks pushed harder for XFS's integration into the
mainstream kernel. That would 'automatically' merge TUX (and any other,
potentially not yet merged piece of kernel code) to XFS as well. (because
i merge against the -ac tree and the -linus tree. [right now there is no
TUX merge against the Linus tree until the Andrea/Linus VM is merged into
-ac.])

        Ingo