Here's a patch against your bk tree that keeps things building for sn2
(and working with the discontig patch applied).

 arch/ia64/sn/io/drivers/ifconfig_net.c |  298 ---------------------------------
 arch/ia64/sn/io/drivers/Makefile     |    2

 Remove ifconfig_net.c.  It's not necessary for 2.5.

 arch/ia64/sn/io/hwgfs/hcl.c          |    4
 arch/ia64/sn/io/machvec/pci_dma.c    |    2

 Fix build errors and warnings.

Thanks,
Jesse