diff options
| author | Jakub Kicinski <[email protected]> | 2021-06-29 22:45:27 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2021-06-29 22:45:27 +0000 |
| commit | b6df00789e2831fff7a2c65aa7164b2a4dcbe599 (patch) | |
| tree | a94cbeeca3f0ae2fffed008cb287c02dbee4dceb /net/dsa/dsa2.c | |
| parent | tcp: change ICSK_CA_PRIV_SIZE definition (diff) | |
| parent | selftests: net: devlink_port_split: check devlink returned an element before ... (diff) | |
| download | kernel-b6df00789e2831fff7a2c65aa7164b2a4dcbe599.tar.gz kernel-b6df00789e2831fff7a2c65aa7164b2a4dcbe599.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/dsa/dsa2.c')
0 files changed, 0 insertions, 0 deletions