projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1ecaf17 1f594fe)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 18 May 2023 21:39:34 +0000 (14:39 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 18 May 2023 21:39:34 +0000 (14:39 -0700)
commit90223c1136b2930751116fb7de9675f55843f3ad
treead66d6f6fe5deb321b82ed4efff70e748e8f21dftree | snapshot
parent1ecaf17d097c91a7bd2979c57f7c81c5eeaf526bcommit | diff
parent1f594fe7c90746982569bd4f3489e809104a9176commit | diff
Merge git://git./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>
22 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/can/bxcan.c diff1 | diff2 | blob | history
drivers/net/ethernet/8390/ne.c diff1 | diff2 | blob | history
drivers/net/ethernet/8390/smc-ultra.c diff1 | diff2 | blob | history
drivers/net/ethernet/8390/wd.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_sriov.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_vf_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_vf_lib.h diff1 | diff2 | blob | history
drivers/net/ethernet/sun/cassini.c diff1 | diff2 | blob | history
drivers/net/phy/phylink.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw88/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw89/mac.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw89/mac.h diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw89/rtw8852b.c diff1 | diff2 | blob | history
include/linux/phy.h diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
Domain: System / Kernel;