Conflicts: kernel/Makefile.build.in
Conflicts: kernel/include/hfi1/sdma.h kernel/sdma.c kernel/user_sdma.c