mainline SBC patches