Skip to content
Commit 193b9b20 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:
  e3f02f32 ("ionic: fix kernel panic due to multi-buffer handling")
  d9c04209

 ("ionic: Mark error paths in the data path as unlikely")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents cce346d4 ffb7aa9f
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