diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-18 14:39:34 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-18 14:39:34 -0700 |
| commit | 90223c1136b2930751116fb7de9675f55843f3ad (patch) | |
| tree | ad66d6f6fe5deb321b82ed4efff70e748e8f21df /net/dns_resolver | |
| parent | 1ecaf17d097c91a7bd2979c57f7c81c5eeaf526b (diff) | |
| parent | 1f594fe7c90746982569bd4f3489e809104a9176 (diff) | |
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 'net/dns_resolver')
0 files changed, 0 insertions, 0 deletions