]> www.infradead.org Git - users/willy/xarray.git/commit
projects / users / willy / xarray.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: aae950b c7d1022)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Sat, 31 Jul 2021 16:14:46 +0000 (09:14 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 31 Jul 2021 16:14:46 +0000 (09:14 -0700)
commitd2e11fd2b7fcd10b7bcef418c55490c934aa94e8
treebdce7769cd4d69b375aad004e844d1a413863485tree
parentaae950b189413ed3201354600d44223da0bcf63ccommit | diff
parentc7d102232649226a69dddd58a4942cf13cff4f7ccommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicting commits, all resolutions pretty trivial:

drivers/bus/mhi/pci_generic.c
  5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU")
  56f6f4c4eb2a ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean")

drivers/nfc/s3fwrn5/firmware.c
  a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label")
  46573e3ab08f ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")
  801e541c79bb ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")

MAINTAINERS
  7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver")
  8a7b46fa7902 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
39 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/sc7180.dtsi diff1 | diff2 | blob | history
arch/x86/net/bpf_jit_comp.c diff1 | diff2 | blob | history
drivers/bus/mhi/pci_generic.c diff1 | diff2 | blob | history
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c diff1 | diff2 | blob | history
drivers/net/can/usb/esd_usb2.c diff1 | diff2 | blob | history
drivers/net/can/usb/peak_usb/pcan_usb.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h diff1 | diff2 | blob | history
drivers/net/ethernet/dec/tulip/winbond-840.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/params.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/trap.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_lif.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_phc.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_txrx.c diff1 | diff2 | blob | history
drivers/net/ethernet/sis/sis900.c diff1 | diff2 | blob | history
drivers/net/ethernet/sun/niu.c diff1 | diff2 | blob | history
drivers/nfc/nfcsim.c diff1 | diff2 | blob | history
drivers/nfc/s3fwrn5/firmware.c diff1 | diff2 | blob | history
include/linux/bpf_verifier.h diff1 | diff2 | blob | history
include/linux/filter.h diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
mm/memcontrol.c diff1 | diff2 | blob | history
net/can/j1939/transport.c diff1 | diff2 | blob | history
net/core/devlink.c diff1 | diff2 | blob | history
net/core/flow_dissector.c diff1 | diff2 | blob | history
net/ipv4/ip_tunnel.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/netfilter/nf_flow_table_core.c diff1 | diff2 | blob | history
net/qrtr/qrtr.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
XArray, radix tree and IDR