diff options
| author | Jakub Kicinski <[email protected]> | 2024-12-05 19:48:58 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-01-04 00:29:29 +0000 |
| commit | 385f186aba3d2f7122b71d6d4c7e236b9d4e8003 (patch) | |
| tree | f1e2a0433b260b137b5eb37e9d48588f5d5643bf /drivers/fpga/socfpga.c | |
| parent | team: prevent adding a device which is already a team device lower (diff) | |
| parent | Merge tag 'net-6.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-385f186aba3d2f7122b71d6d4c7e236b9d4e8003.tar.gz kernel-385f186aba3d2f7122b71d6d4c7e236b9d4e8003.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.13-rc6).
No conflicts.
Adjacent changes:
include/linux/if_vlan.h
f91a5b808938 ("af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK")
3f330db30638 ("net: reformat kdoc return statements")
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/fpga/socfpga.c')
0 files changed, 0 insertions, 0 deletions