mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-06-27 23:34:49 +00:00
Conflicts: drivers/net/ethernet/broadcom/genet/bcmgenet.c net/core/sock.c Conflicts were overlapping changes in bcmgenet and the lockdep handling of sockets. Signed-off-by: David S. Miller <davem@davemloft.net>