]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f374f95 a6609e0)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 30 Sep 2021 21:49:21 +0000 (14:49 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 30 Sep 2021 21:49:21 +0000 (14:49 -0700)
commit15c5ce6d6a85d5f237c7853f458ef039ed32e242
tree4a827b3e88fd896de1408c26ebebc2535b14750atree | snapshot
parentf374f95a78e7cd56864844e1d8b327900f074f36commit | diff
parenta6609e099c373964a7b86c89d936b1bf88eeb484commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

drivers/net/phy/bcm7xxx.c
  8dc52b29cd91 ("net: phy: bcm7xxx: Fixed indirect MMD operations")
  b35c74b468cb ("net: phy: bcm7xxx: Add EPHY entry for 72165")

net/sched/sch_api.c
  9cac5952c932 ("net: prevent user from passing illegal stab size")
  cbe495124963 ("net_sched: Use struct_size() and flex_array_size() helpers")

Both cases trivial - adjacent code additions.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
17 files changed:
arch/x86/net/bpf_jit_comp.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/enetc/enetc_pf.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hnae3.h diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/ibm/ibmvnic.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/phy/bcm7xxx.c diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
net/bpf/test_run.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/mptcp/mptcp_diag.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/mptcp/protocol.h diff1 | diff2 | blob | history
net/sched/sch_api.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/Makefile diff1 | diff2 | blob | history
Linux Kernel Source Tree.