OSDN Git Service

Merge branch 'ip_tunnel-next'
authorDavid S. Miller <davem@davemloft.net>
Sat, 26 Jan 2019 17:43:03 +0000 (09:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 26 Jan 2019 17:43:03 +0000 (09:43 -0800)
commita4b829949326eef58e49b00160620a32833a3c0c
treed3b156bcb55cb4d1fe93587ca78e75f8b90cc0fa
parent662a14d0c71e9e775383b0fd6796c9eb47d29ecc
parent962924fa2b7afa92b51088965ce5dca65ad90da7
Merge branch 'ip_tunnel-next'

wenxu says:

====================
ip_tunnel: Refactor ip_gre collect metadata xmit to ip_md_tunnel_xmit

This patchset add tunnel_dst_cache and tnl_update_pmtu feature for
ip_md_tunnel_xmit also bugfix. Then Refactor collect metatdata mode
tunnel xmit to ip_md_tunnel_xmit
====================

Signed-off-by: David S. Miller <davem@davemloft.net>