2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-09 22:24:04 +08:00
linux-next/drivers/net/wwan
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
..
iosm Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-05 15:08:47 -07:00
Kconfig net: wwan: Add MHI MBIM network driver 2021-08-04 10:10:12 +01:00
Makefile net: wwan: Add MHI MBIM network driver 2021-08-04 10:10:12 +01:00
mhi_wwan_ctrl.c net: wwan: mhi_wwan_ctrl: Fix possible deadlock 2021-08-07 09:35:48 +01:00
mhi_wwan_mbim.c wwan: mhi: Fix missing spin_lock_init() in mhi_mbim_probe() 2021-08-09 10:18:08 +01:00
rpmsg_wwan_ctrl.c net: wwan: Allow WWAN drivers to provide blocking tx and poll function 2021-06-18 13:13:40 -07:00
wwan_core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
wwan_hwsim.c wwan: core: support default netdev creation 2021-06-22 10:01:16 -07:00