Skip to content
Commit dd9a887b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

net/sched/sch_api.c
  b193e15a ("net: prevent user from passing illegal stab size")
  69508d43

 ("net_sched: Use struct_size() and flex_array_size() helpers")

Both cases trivial - adjacent code additions.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b0517302 4de593fb
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment