I think you need to look at three merge windows. 1) Add new function(s) for creating user/kernel sockets with/without holding a namespace reference. 2) Update all the callers to use the new functions. 3) Delete the old functions. There is no point modifying the callers twice, and the commits need to explicitly state whether they want the namespace held or not. David
