Merge 051170d3 ("net/ipv4: fix type mismatch in inet_ehash_locks_alloc()...

Merge 051170d3 ("net/ipv4: fix type mismatch in inet_ehash_locks_alloc() causing build failure") into android12-5.10-lts

Steps on the way to 5.10.239

Resolves merge conflicts in:
	net/ipv4/inet_hashtables.c

Change-Id: I7aa4bbe49c7a684a4dffb06b5bb59e0053b18b10
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>