diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-01-08 13:28:00 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-08 13:28:00 -0800 |
| commit | 833d22f2f922bbee6430e558417af060db6bbe9c (patch) | |
| tree | 8d2d8824318d53d6d8e3b7bf5680f953a62c2f3b /net/core/sock_map.c | |
| parent | Merge branch 'generic-zcopy_-functions' (diff) | |
| parent | Merge tag 'net-5.11-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | wireguard-linux-833d22f2f922bbee6430e558417af060db6bbe9c.tar.xz wireguard-linux-833d22f2f922bbee6430e558417af060db6bbe9c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in CAN on file rename.
Conflicts:
drivers/net/can/m_can/tcan4x5x-core.c
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/sock_map.c')
0 files changed, 0 insertions, 0 deletions