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
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
..
3com ethernet: isa: convert to module_init/module_exit 2021-08-03 13:05:26 +01:00
8390 ethernet: isa: convert to module_init/module_exit 2021-08-03 13:05:26 +01:00
actions dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
adaptec dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
aeroflex net: ethernet: aeroflex: fix UAF in greth_of_remove 2021-06-19 11:45:10 -07:00
agere dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
alacritech
…
allwinner dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
alteon net: alteon: remove leading spaces before tabs 2021-05-19 12:17:30 -07:00
altera of: net: pass the dst buffer to of_get_mac_address() 2021-04-13 14:35:02 -07:00
amazon Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 2021-06-28 15:28:03 -07:00
amd ethernet: isa: convert to module_init/module_exit 2021-08-03 13:05:26 +01:00
apm
…
apple net: apple: remove leading spaces before tabs 2021-05-19 12:17:30 -07:00
aquantia dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
arc dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
atheros dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
broadcom Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
brocade net: brocade: bna: Fix wrong function name in comments 2021-05-17 14:12:38 -07:00
cadence dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
calxeda net: calxeda: Fix wrong function name in comments 2021-05-17 14:12:38 -07:00
cavium devlink: Set device as early as possible 2021-08-09 10:21:40 +01:00
chelsio cxgb4: make the array match_all_mac static, makes object smaller 2021-08-02 15:01:26 -07:00
cirrus ethernet: isa: convert to module_init/module_exit 2021-08-03 13:05:26 +01:00
cisco ethernet:enic: Fix a use after free bug in enic_hard_start_xmit 2021-05-03 13:23:00 -07:00
cortina net: gemini: Use devm_platform_get_and_ioremap_resource() 2021-06-07 13:20:00 -07:00
davicom dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
dec tulip: Remove deadcode on startup true condition 2021-08-07 09:39:54 +01:00
dlink dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
emulex Revert "be2net: disable bh with spin_lock in be_process_mcc" 2021-06-25 11:44:16 -07:00
ezchip net: ethernet: ezchip: fix error handling 2021-06-19 11:46:00 -07:00
faraday dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
freescale net: fec: fix build error for ARCH m68k 2021-08-09 10:59:46 +01:00
fujitsu Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-05-27 09:55:10 -07:00
google gve: fix the wrong AdminQ buffer overflow check 2021-07-16 10:41:40 -07:00
hisilicon net: hns3: add support for triggering reset by ethtool 2021-08-11 15:03:30 -07:00
huawei devlink: Set device as early as possible 2021-08-09 10:21:40 +01:00
i825xx m68k: remove legacy probing 2021-08-03 13:05:25 +01:00
ibm dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
intel Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
marvell Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
mediatek dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
mellanox Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
micrel dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
microchip Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
microsoft Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-06-29 15:45:27 -07:00
moxa net: moxa: fix UAF in moxart_mac_probe 2021-07-09 11:01:01 -07:00
mscc net: mscc: Fix non-GPL export of regmap APIs 2021-08-12 09:44:31 +01:00
myricom ethernet: myri10ge: Fix missing error code in myri10ge_probe() 2021-06-01 15:54:38 -07:00
natsemi Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-05 15:08:47 -07:00
neterion Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-05 15:08:47 -07:00
netronome devlink: Set device as early as possible 2021-08-09 10:21:40 +01:00
ni net: nixge: simplify code with devm platform functions 2021-06-08 16:36:57 -07:00
nvidia
…
nxp dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
oki-semi dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
packetengines dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
pasemi
…
pensando devlink: Set device as early as possible 2021-08-09 10:21:40 +01:00
qlogic devlink: Set device as early as possible 2021-08-09 10:21:40 +01:00
qualcomm dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
rdc dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
realtek Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
renesas dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
rocker Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
samsung dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
seeq net: seeq: remove leading spaces before tabs 2021-05-19 12:17:31 -07:00
sfc dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
sgi dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
silan
…
sis Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-07-31 09:14:46 -07:00
smsc ethernet: isa: convert to module_init/module_exit 2021-08-03 13:05:26 +01:00
socionext dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
stmicro net: ethernet: stmmac: Do not use unreachable() in ipq806x_gmac_probe() 2021-08-07 09:45:46 +01:00
sun niu: read property length only if we use it 2021-08-02 10:24:07 +01:00
synopsys dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
tehuti tehuti: use ndo_siocdevprivate 2021-07-27 20:11:43 +01:00
ti Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
toshiba dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
tundra dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
via dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
wiznet net: w5100: Use devm_platform_get_and_ioremap_resource() 2021-06-10 13:53:13 -07:00
xilinx dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
xircom dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
xscale dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
Kconfig net: korina: Make driver COMPILE_TESTable 2021-04-19 15:58:14 -07:00
Makefile net: mana: Add a driver for Microsoft Azure Network Adapter (MANA) 2021-04-19 15:24:25 -07:00
dnet.c dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
dnet.h
…
ec_bhf.c net: ethernet: fix potential use-after-free in ec_bhf_remove 2021-06-18 13:01:17 -07:00
ethoc.c dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
fealnx.c dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
jme.c dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
jme.h
…
korina.c dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
lantiq_etop.c dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
lantiq_xrx200.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-06-18 19:47:02 -07:00