From: David S. Miller Date: Fri, 29 May 2020 20:10:39 +0000 (-0700) Subject: Merge branch 'remove-kernel_setsockopt-v4' X-Git-Tag: baikal/mips/sdk5.9~13530^2~59 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=7a58f7b352fcaa083d2456d076e729257aed8ac1;p=kernel.git Merge branch 'remove-kernel_setsockopt-v4' Christoph Hellwig says: ==================== remove kernel_setsockopt v4 now that only the dlm calls to sctp are left for kernel_setsockopt, while we haven't really made much progress with the sctp setsockopt refactoring, how about this small series that splits out a sctp_setsockopt_bindx_kernel that takes a kernel space address array to share more code as requested by Marcelo. This should fit in with whatever variant of the refator of sctp setsockopt we go with, but just solved the immediate problem for now. Changes since v3: - dropped all the merged patches, just sctp setsockopt left now - factor out a new sctp_setsockopt_bindx_kernel helper instead of duplicating a small amount of logic Changes since v2: - drop the separately merged kernel_getopt_removal - drop the sctp patches, as there is conflicting cleanup going on - add an additional ACK for the rxrpc changes Changes since v1: - use ->getname for sctp sockets in dlm - add a new ->bind_add struct proto method for dlm/sctp - switch the ipv6 and remaining sctp helpers to inline function so that the ipv6 and sctp modules are not pulled in by any module that could potentially use ipv6 or sctp connections - remove arguments to various sock_* helpers that are always used with the same constant arguments ==================== Signed-off-by: David S. Miller --- 7a58f7b352fcaa083d2456d076e729257aed8ac1