mirror of
https://github.com/edk2-porting/linux-next.git
synced 2025-01-09 14:14:00 +08:00
adc2e56ebe
Trivial conflicts in net/can/isotp.c and tools/testing/selftests/net/mptcp/mptcp_connect.sh scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c to include/linux/ptp_clock_kernel.h in -next so re-apply the fix there. Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
||
---|---|---|
.. | ||
ena_admin_defs.h | ||
ena_com.c | ||
ena_com.h | ||
ena_common_defs.h | ||
ena_eth_com.c | ||
ena_eth_com.h | ||
ena_eth_io_defs.h | ||
ena_ethtool.c | ||
ena_netdev.c | ||
ena_netdev.h | ||
ena_pci_id_tbl.h | ||
ena_regs_defs.h | ||
Makefile |