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

Browse Source

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>

...

This commit is contained in:

Greg Kroah-Hartman

2025-07-13 12:42:15 +00:00

parent 6200a3734e 051170d38a

commit 0fc8abaf7c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available