UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/ethernet/broadcom/bnxt
History
Jakub Kicinski f4083a752a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
  9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
  9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins")
  099fdeda65 ("bnxt_en: Event handler for PPS events")

kernel/bpf/helpers.c
include/linux/bpf-cgroup.h
  a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()")
  c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current")

drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
  5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray")
  2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer")

MAINTAINERS
  7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
  7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 		2021-08-13 06:41:22 -07:00
..
Makefile bnxt_en: Add PTP clock APIs, ioctls, and ethtool methods 2021-06-28 13:41:05 -07:00
bnxt.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
bnxt.h bnxt_en: Increase maximum RX ring size if jumbo ring is not used 2021-08-03 12:38:47 +01:00
bnxt_coredump.h
…
bnxt_dcb.c bnxt_en: reject ETS settings that will starve a TC 2021-07-19 08:25:43 -07:00
bnxt_dcb.h
…
bnxt_debugfs.c bnxt: no need to check return value of debugfs_create functions 2019-08-10 15:25:47 -07:00
bnxt_debugfs.h
…
bnxt_devlink.c devlink: Set device as early as possible 2021-08-09 10:21:40 +01:00
bnxt_devlink.h bnxt_en: Refactor bnxt_dl_info_get(). 2020-10-12 14:27:03 -07:00
bnxt_dim.c linux/dim: Move implementation to .c files 2019-06-25 13:46:39 -07:00
bnxt_ethtool.c bnxt_en: Increase maximum RX ring size if jumbo ring is not used 2021-08-03 12:38:47 +01:00
bnxt_ethtool.h devlink: move request_firmware out of driver 2020-11-19 21:40:57 -08:00
bnxt_fw_hdr.h
…
bnxt_hsi.h bnxt_en: Update firmware interface to 1.10.2.52 2021-08-08 13:05:51 +01:00
bnxt_nvm_defs.h
…
bnxt_ptp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
bnxt_ptp.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
bnxt_sriov.c bnxt_en: Update firmware interface to 1.10.2.47 2021-06-28 13:41:05 -07:00
bnxt_sriov.h bnxt_en: allow promiscuous mode for trusted VFs 2021-04-25 18:37:38 -07:00
bnxt_tc.c net: bnxt: don't complain if TC flower can't be supported 2020-07-17 18:26:20 -07:00
bnxt_tc.h bnxt_en: Fix array overrun in bnxt_fill_l2_rewrite_fields(). 2019-11-13 14:28:30 -08:00
bnxt_ulp.c bnxt_en: Refresh RoCE capabilities in bnxt_ulp_probe() 2021-07-19 08:25:43 -07:00
bnxt_ulp.h bnxt_en: Add doorbell information to bnxt_en_dev struct. 2020-05-04 10:44:11 -07:00
bnxt_vfr.c bnxt_en: Free and allocate VF-Reps during error recovery. 2021-04-12 13:20:38 -07:00
bnxt_vfr.h bnxt_en: Free and allocate VF-Reps during error recovery. 2021-04-12 13:20:38 -07:00
bnxt_xdp.c bnxt: Remove rcu_read_lock() around XDP program invocation 2021-06-24 19:43:49 +02:00
bnxt_xdp.h bnxt_en: optimized XDP_REDIRECT support 2019-07-08 15:15:24 -07:00