Merge "Define SIOCKILLADDR which isn't in the common kernel uapi headers."