commit | 2db6909f7afdce5c1278da46f6f821dff8803fca | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 31 04:21:28 2018 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jan 31 04:21:28 2018 +0000 |
tree | cb51b9201345e3b3885d98d8d10bbb08ec324275 | |
parent | 59466732e7e237435e9eb4fbe8c77bfcd6f0211b [diff] | |
parent | 28f9526bf33bbf99038b68ab9fc4166b3d437dd0 [diff] |
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.