mirror of
https://github.com/Evolution-X-Devices/kernel_google_b1c1
synced 2026-02-10 00:03:25 +00:00
trivial conflict in net/socket.c and non-trivial one in crypto - that one had evaded aio_complete() removal. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>