2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-09 14:14:00 +08:00
linux-next/drivers/net/ethernet/amazon/ena
Jakub Kicinski adc2e56ebe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
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>
2021-06-18 19:47:02 -07:00
..
ena_admin_defs.h net: ena: Remove unused code 2021-06-08 14:41:09 -07:00
ena_com.c net: ena: re-organize code to improve readability 2021-06-08 14:41:10 -07:00
ena_com.h ethernet: amazon: ena: A typo fix in the file ena_com.h 2021-03-15 12:48:20 -07:00
ena_common_defs.h net: ena: Change license into format to SPDX in all files 2020-09-21 13:54:22 -07:00
ena_eth_com.c net: ena: Improve error logging in driver 2021-06-08 14:41:09 -07:00
ena_eth_com.h net: ena: add device distinct log prefix to files 2020-12-09 15:26:40 -08:00
ena_eth_io_defs.h net: ena: Change license into format to SPDX in all files 2020-09-21 13:54:22 -07:00
ena_ethtool.c net: ena: re-organize code to improve readability 2021-06-08 14:41:10 -07:00
ena_netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-06-18 19:47:02 -07:00
ena_netdev.h net: ena: add jiffies of last napi call to stats 2021-06-08 14:41:09 -07:00
ena_pci_id_tbl.h net: ena: Change license into format to SPDX in all files 2020-09-21 13:54:22 -07:00
ena_regs_defs.h net: ena: Change license into format to SPDX in all files 2020-09-21 13:54:22 -07:00
Makefile treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00