]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'gtp-sgsn-side-tunnel'
authorDavid S. Miller <davem@davemloft.net>
Sun, 26 Mar 2017 03:11:19 +0000 (20:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 26 Mar 2017 03:11:19 +0000 (20:11 -0700)
commit344f2a7a3baf64eba9c26bbeb55c474dac95e910
tree73165e856fe64a2bf64a20fc256b8161b3a66f3e
parent932ee203b751d60bc3304c5edb26bc8c8c1f58f4
parent14b68f991f68ae0735677de46b530564de0b67c2
Merge branch 'gtp-sgsn-side-tunnel'

Jonas Bonn says:

====================
GTP SGSN-side tunnel

Changes since v4:

* Respin the series on top of net-next; the conflicts were trivial,
  amounting to just code having been shifted about
====================

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