diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2023-08-18 12:44:22 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2023-08-18 12:44:56 -0700 |
| commit | 7ff57803d24e0cb326251489d70f60462e3e6c04 (patch) | |
| tree | 4ff813109291e5d2c7745619d490af3cce481674 /net/openvswitch/flow_table.h | |
| parent | Merge branch 'netconsole-enable-compile-time-configuration' (diff) | |
| parent | Merge tag 'net-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-7ff57803d24e0cb326251489d70f60462e3e6c04.tar.gz linux-7ff57803d24e0cb326251489d70f60462e3e6c04.tar.bz2 linux-7ff57803d24e0cb326251489d70f60462e3e6c04.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/sfc/tc.c
fa165e194997 ("sfc: don't unregister flow_indr if it was never registered")
3bf969e88ada ("sfc: add MAE table machinery for conntrack table")
https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/
No adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/openvswitch/flow_table.h')
0 files changed, 0 insertions, 0 deletions