Commit 2db6909f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I47abfed5,I70124bbe,Id414080d,Ica311d44 

* changes:
  Make xfrm_test pass with newer versions of iproute.
  Don't fail if CONFIG_INET_UDP_DIAG is not enabled.
  Fix tests to pass on newer versions of scapy.
  Make testIPv6PktinfoRouting pass on 32-bit Python.
parents 59466732 28f9526b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment