Commit e3afe5dd authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

net/core/page_pool_user.c
  0b11b1c5 ("netdev: let netlink core handle -EMSGSIZE errors")
  429679dc

 ("page_pool: fix netlink dump stop/resume")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a148f82c df479350
Supports Markdown
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