[rsbac-commit] linux-6.12.y 6.12.91 commit 3c9e5b6beba7 Fix merge errors in net/socket.c