diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-18 23:39:34 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-18 23:39:34 +0200 |
| commit | 90223c1136b2930751116fb7de9675f55843f3ad (patch) | |
| tree | ad66d6f6fe5deb321b82ed4efff70e748e8f21df /drivers/net/wireless/realtek/rtw89/fw.h | |
| parent | Merge tag 'nf-next-2023-05-18' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Merge tag 'net-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-90223c1136b2930751116fb7de9675f55843f3ad.tar.xz linux-90223c1136b2930751116fb7de9675f55843f3ad.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/freescale/fec_main.c
6ead9c98cafc ("net: fec: remove the xdp_return_frame when lack of tx BDs")
144470c88c5d ("net: fec: using the standard return codes when xdp xmit errors")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/wireless/realtek/rtw89/fw.h')
0 files changed, 0 insertions, 0 deletions