]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b27cc94 5141481)
Merge branch 'mlxsw-IPIP-cleanups'
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Feb 2018 17:24:28 +0000 (12:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Feb 2018 17:24:28 +0000 (12:24 -0500)
commit904ea36bc94636b6ebf515c33a054da4671a9a6c
tree6f0d9db02b826a665e7567fd192e47b118aa88a1tree | snapshot
parentb27cc94b57ee81bd3b21f7370ba24f27f370c682commit | diff
parent51414817b3fc28156dcc1acfdd45f44816dd37a6commit | diff
Merge branch 'mlxsw-IPIP-cleanups'

Jiri Pirko says:

====================
mlxsw: IPIP cleanups

In the first patch, a forgotten #include is added. Even though the code
compiles as-is, the include is necessary for modules that should include
spectrum_ipip.h.

The second patch corrects an assumption that IPv6 tunnels use struct
ip_tunnel_parm to store tunnel parameters.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.